From patchwork Mon Jan 22 20:21:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59489 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 186E027BBE9; Sat, 27 Jan 2024 20:59:39 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F82F27BBE2 for ; Sat, 27 Jan 2024 20:59:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplQ-0004sm-IP; Sat, 27 Jan 2024 15:58:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplP-0004sF-9s for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplP-0005qB-1E for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplV-000561-VJ for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638910019495 (code B ref 67260); Sat, 27 Jan 2024 20:59:01 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:20 +0000 Received: from localhost ([127.0.0.1]:56035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkq-00054C-6F for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:49226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkm-00053S-9c for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a357cba4a32so8680466b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389083; x=1706993883; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=BKKTxx1prubQn/yNOr+OP+t3On58djdG/frDz6VOdQn+dNkFFb/EANKhjB+4xVDlme epgOq4rRz1kEkLtVJakGLNdWYwqrX7UF51VP/NdhCoQTb8NnNEWFncJCMlbIDcHG67nU mMvC1AXyfob+Jul4cUS4Lb4LW5nCSGdQoSTwLlYMI3YQkUZ4GqepChrvKHlWqiO++uFm PmB+WJpfm39h12sjxGSIKVikRFYQVwvV67o5mVFDGkmjH3uuxYGKHNT7hWIfZNU0B9DQ hvLLmWYi8r4EsOowAGuCs6FR3yrtLIOykNOHQ2PmiC1tF8rtM/GkBU31e7gyyID/tGZN 8ZSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389083; x=1706993883; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=De9v+axQ0SzHKwCPWPTYlsbRmetW+ZWvJCmhabqYTrI=; b=cu59ZHNDKcUv3w3nMqhk+adxmCFwh22pe3NB4sFTjXg7Y+4mScr7PV9D8nb9X3/MBV UI8iYvcLTb2Nf900xmwD6D/GFsKSGCcnmGh49B8ooOwScmcDZVdAxSb0Uzvl7rnAEtgn bUCL4unMbXMBkD0Yn/H+0sKGk3X0KJDzW3MHYzc1ttPPWXlJ5dPdO2/xmysY1qaC7Aen ggxJDo8MiC2vNtY9LgRRSi+WHvyDXbYYoQ/XlFPGn9ERYWPaWi8uMWcPBnKtGp+h7oU6 jyXXa7kQ3SodFAd5lsLMvVR/3DFxv/vnwY6+qGXZIHlGHxi2SyU4AC7whbe8mLH9cdIg EYaw== X-Gm-Message-State: AOJu0YyNqb++e0+aGSAE+FnUUkHecA0iIi+OJkYUliCFFHlwanP9zv1I Dzr9vGqT1Gpbp/z2rdQxCy8jaB9R3xEkg6aXyecQezoTYo6ZZKjC3bl7ENnm6kQ= X-Google-Smtp-Source: AGHT+IHS9lugUGglP+TYAa0re4Zq2kxMhXpiXWA+EOspkb7DFzx7lt4SFiy5/usAX6EpuyUzI5TKBg== X-Received: by 2002:a17:906:a04e:b0:a34:d1a9:77ad with SMTP id bg14-20020a170906a04e00b00a34d1a977admr1601315ejb.22.1706389082980; Sat, 27 Jan 2024 12:58:02 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:02 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Mon, 22 Jan 2024 21:21:26 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-minimal)[wrap-emacs-paths]: Also wrap EMACSNATIVELOADPATH. --- gnu/packages/emacs.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f27c551e0..2cdc9b8bca 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -273,7 +273,11 @@ (define-public emacs-minimal (let* ((out (assoc-ref outputs "out")) (lisp-dirs (find-files (string-append out "/share/emacs") "^lisp$" - #:directories? #t))) + #:directories? #t)) + (native-lisp-dirs (find-files + (string-append out "/lib/emacs") + "^native-lisp$" + #:directories? #t))) (for-each (lambda (prog) (wrap-program prog @@ -285,7 +289,11 @@ (define-public emacs-minimal (list (search-input-file inputs "/bin/gzip") ;; for coreutils (search-input-file inputs "/bin/yes")))) - `("EMACSLOADPATH" suffix ,lisp-dirs))) + `("EMACSLOADPATH" suffix ,lisp-dirs) + ;; Note: the interpretation order of EMACSNATIVELOADPATH + ;; is reversed, so 'prefix functions just like 'suffix + ;; for EMACSLOADPATH. + `("EMACSNATIVELOADPATH" prefix ,native-lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. ;; We don't patch emacsclient, because it takes its From patchwork Sun Jan 21 12:12:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59485 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0E77727BBEA; Sat, 27 Jan 2024 20:59:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E24C27BBE9 for ; Sat, 27 Jan 2024 20:59:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplP-0004sX-Tm; Sat, 27 Jan 2024 15:58:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplO-0004s7-PC for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplO-0005q4-H9 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplV-00055t-In for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 2/7] gnu: emacs: Build trampolines. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638910019483 (code B ref 67260); Sat, 27 Jan 2024 20:59:01 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:20 +0000 Received: from localhost ([127.0.0.1]:56032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkp-00053s-Dj for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkn-00053T-6o for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:18 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a28fb463a28so148639266b.3 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389084; x=1706993884; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=Et0ctxEctfCt65YT2Kig42OVBkXjfkMhxb9W0miLoK6e3AwM0czH6De1adgsvSHLp1 n8cLBbBXiF1NSMkEnD/gdNNwxYe6xf+ZVozqDclJC3jruhBDyFzlcoEr7o6BW635w4s7 it6LKXZ5MTu2U3ZGU+vl8h3yhWI2+DoK10gNSVrrm6v6JoCafxPmzACqlTXWBnpx6ZNw lMUzVBKJ2CSjpfkgiMhiGwqj6tLu81S+vkDQluPM6fYe1BYvM111nA/eC+VK9OUsDTFF UgPiBsDPDHcyVf7zZaavnuYXzKmsX1+6beLi0a9Zy7WBNDtHAjAeoN7XtJMc49wr749v vBCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389084; x=1706993884; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CrugE62fF7xQBwEsECaO734Lhny3WmTIiiX3YaE66dE=; b=j5Kdxs8UY3kFs/YofwycJ4fHEyu9K/Qh+7EN4iEjqQUR2eT1LrTC/Al1Ah4lWLp/aT b5Ds0/QbGV0ciwMga8fRHxtxKE3swD4fIdei2Sspub3SHUtQrgvLRC5xXkJzs2RIK1+A u3Oq8qOJwCVfrfXoHx36zIHJbKpuquYXYSvDy+DRuTRpZig4z2ofp6HgaXJDot3MDVWB F/jdJ6wy2NzXUE14euRYp8cRd3VOiCq4ZQ0rXQSY48ds6lz7UpCeL9kVXhQQlXBX7Zbz imksoRtbr3sJIqR7vMc3Sf1fKbL/EzNI/oBy5dNluAzRCrg3+edHunJwzoMo4NxMHKRj lSaA== X-Gm-Message-State: AOJu0YwwuEHuiA7qrjuxti8VPtLQb/u/bFf9OQ0JWRZUbmnLEWp9v0hB tCTyyRlGicYW4Q9d2IA08gPYNsugkR5AaBJs1HHd0wqqQ83d3UEVHCzAk/HxwXY= X-Google-Smtp-Source: AGHT+IF2ti8yIK9B8GWJpo7+5eZ009Xt8pvjbPfRmii7AhBLaAZhzPnTtpeoAK1NiE1CxrI9BcGAcQ== X-Received: by 2002:a17:906:37d4:b0:a34:e8ed:1000 with SMTP id o20-20020a17090637d400b00a34e8ed1000mr1539143ejc.9.1706389083658; Sat, 27 Jan 2024 12:58:03 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:03 -0800 (PST) Message-ID: <75fc54d6051c02ab2edc333de71ee4689a287ed0.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:41 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs-no-x)[#:phases]: Add ‘build-trampolines’. Change-Id: I33303bcbaf6cbda15867a5546e793c05d1f0e67b --- gnu/packages/emacs.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 2cdc9b8bca..0292b1bd16 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -384,7 +384,10 @@ (define-public emacs-no-x (string-append "-B" #$(this-package-input "libgccjit") "/lib/") (string-append - "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))))))) + "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))) + (add-after 'build 'build-trampolines + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "trampolines" make-flags))))))) (inputs (modify-inputs (package-inputs emacs-minimal) (prepend gnutls From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59488 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CB55627BBE9; Sat, 27 Jan 2024 20:59:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF6C827BBE2 for ; Sat, 27 Jan 2024 20:59:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplS-0004ty-QA; Sat, 27 Jan 2024 15:58:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplQ-0004sh-Ci for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplQ-0005qX-59 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplX-00056N-CI for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 3/7] gnu: emacs: Don't hash file names in native compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911319534 (code B ref 67260); Sat, 27 Jan 2024 20:59:03 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:33 +0000 Received: from localhost ([127.0.0.1]:56042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl2-00054t-3A for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:32 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:60448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053V-0A for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-510f37d673aso258502e87.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389085; x=1706993885; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=asbTURC9H2MLQ5TCyJCEXLGJFlcs8+liwrpQdjTGKmk=; b=TZLMnuOg2h9GCB9hfupNszgrYHBJw4jvK9OdBmXd/fAXJ/ze/+alQOc3Wof/esi0gl M1ON6BgP8odqu5sw7nLa99bai21+tJ+w+uaPi7GQ3h3rslX7Ac2NyxD+TdzDla1eZde9 rK3njV+7Nx5yIhKbOSKpwW8L66Hld5F8zEdP5qw8GcOUyWASjRoH6z40QeJo6h2amroy 6CIHs2vD+Rb2XycLUGVtJUCBxbl9vRMu83IBeX4WqW88ubb2rRHQvgKXzvziYCTSylZV DTCLo7dy6AP0W0r6jSTuo7H5ko9UwJiTaB89VqyeYJA52nuSYpguTMeUVhcaBt/eNvC1 BX5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389085; x=1706993885; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=asbTURC9H2MLQ5TCyJCEXLGJFlcs8+liwrpQdjTGKmk=; b=bpvrTOvEBa6iyXCOviJE8Lmz+DN+QU82cIPOwQSpg4zGh2O40y4trVKKsfADwi59a8 aloI8gJU+N6XHhyGNSJVrJOWaj1LUNFipsrF+pgpJlsFYqRuTFW59OMwgSZnnyXm372n jxSjWefjKyn2JC5wfmPDGgFmNXBn5R2Ojx0S4bmWwh04CWe4nMqzzTeKGQf8IZ2K0vgL wcRKNDpbpjTMRrBtTVABL7lDyN+9FneNHl1P5RbDmZHQn999+dRRcuUHL4qx/9UvGO0r Ia1Vo27XpQwMC5BM35zB8urjhDOlOe+jVHluvblrEoN3nBQ5ksF5YNONSpIRo6/9kj70 SS7Q== X-Gm-Message-State: AOJu0YzNDE7UqQu5c3TWxG43kJaDG7UXlEkffQX1MC0pVkcN5jdE4KpN 4KOB1r9jbankGgT/AkTisXYuucJJUDbbfjz4qChVh8DWJCFKx+yWArL+IYgg X-Google-Smtp-Source: AGHT+IECA8Pl9QmXMy07BfYsIuSR/N30XjlNg05DVbcmj3fhxXFKx1JsTINkTw4QhZKgFK77n5kdIQ== X-Received: by 2002:ac2:596c:0:b0:510:c7c:5a6a with SMTP id h12-20020ac2596c000000b005100c7c5a6amr2085385lfp.61.1706389084364; Sat, 27 Jan 2024 12:58:04 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:04 -0800 (PST) Message-ID: <90158d146ad5fb93c944a67d8a4af204249794df.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-native-comp-fix-filenames.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[source]: Use it here. Change-Id: I2b7f6b45742a985760f0097bb53910f068e3d8e5 --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 1 + .../emacs-native-comp-fix-filenames.patch | 292 ++++++++++++++++++ 3 files changed, 294 insertions(+) create mode 100644 gnu/packages/patches/emacs-native-comp-fix-filenames.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3d1afd4555..7e6a0c5006 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ + %D%/packages/patches/emacs-native-comp-fix-filenames.patch \ %D%/packages/patches/emacs-next-exec-path.patch \ %D%/packages/patches/emacs-next-native-comp-driver-options.patch \ %D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 0292b1bd16..1caa2cbee0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -111,6 +111,7 @@ (define-public emacs-minimal (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" + "emacs-native-comp-fix-filenames.patch" "emacs-pgtk-super-key-fix.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/emacs-native-comp-fix-filenames.patch b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch new file mode 100644 index 0000000000..8e7edfe5c3 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,292 @@ +Upstream hashes both the absolute file name and the content of a file +to derive the name for the natively compiled files. This breaks the +staged install used in guix, as any $GUIX_PROFILE is distinct from +the build directory. It also breaks grafts, as hardcoded store file +names get rewritten; thus changing the file hash. + +In addition, this patch changes how native-comp-eln-load-path is +constructed. Upstream, an entry of the directory “../lisp” is added +supposedly for bootstrap only, but this directory appears to find its +way into the actual variable despite attempts to remove it by calling +‘startup--update-eln-cache’. +The user-visible procedure ‘startup-redirect-eln-cache’ is kept, as +packages may require it, but only pushes the new value now. + +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -4396,26 +4396,17 @@ DEFUN ("comp-el-to-eln-rel-filename", Fc + Scomp_el_to_eln_rel_filename, 1, 1, 0, + doc: /* Return the relative name of the .eln file for FILENAME. + FILENAME must exist, and if it's a symlink, the target must exist. +-If FILENAME is compressed, it must have the \".gz\" extension, +-and Emacs must have been compiled with zlib; the file will be +-uncompressed on the fly to hash its contents. +-Value includes the original base name, followed by 2 hash values, +-one for the file name and another for its contents, followed by .eln. */) ++FILENAME is resolved relative to `load-path' and only the suffix of ++the first matching path is kept. If FILENAME is not found to be relative ++to any directory `load-path', it is used as-is to construct the return ++value. */) + (Lisp_Object filename) + { + CHECK_STRING (filename); + +- /* Resolve possible symlinks in FILENAME, so that path_hash below +- always compares equal. (Bug#44701). */ +- filename = Fexpand_file_name (filename, Qnil); +- char *file_normalized = realpath (SSDATA (ENCODE_FILE (filename)), NULL); +- if (file_normalized) +- { +- filename = DECODE_FILE (make_unibyte_string (file_normalized, +- strlen (file_normalized))); +- xfree (file_normalized); +- } ++ Lisp_Object rel_name = filename; + ++ filename = Fexpand_file_name (filename, Qnil); + if (NILP (Ffile_exists_p (filename))) + xsignal1 (Qfile_missing, filename); + +@@ -4423,64 +4414,54 @@ one for the file name and another for it + filename = Fw32_long_file_name (filename); + #endif + +- Lisp_Object content_hash = comp_hash_source_file (filename); ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object len = Flength (XCAR (tail)); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ XCAR (tail), make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, Fadd1 (len), Qnil); ++ break; ++ } ++ } + +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; + +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); + +- 'dlopen' can return the same handle if two shared with the same +- filename are loaded in two different times (even if the first was +- deleted!). To prevent this scenario the source file content is +- included in the hashing algorithm. +- +- As at any point in time no more then one file can exist with the +- same filename, should be possible to clean up all +- filename-path_hash-* except the most recent one (or the new one +- being recompiled). +- +- As installing .eln files compiled during the build changes their +- absolute path we need an hashing mechanism that is not sensitive +- to that. For this we replace if match PATH_DUMPLOADSEARCH or +- *PATH_REL_LOADSEARCH with '//' before computing the hash. */ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ FOR_EACH_TAIL_SAFE (tail) ++ { ++ Lisp_Object directory = Ffile_name_as_directory (XCAR (tail)); ++ Lisp_Object len = Flength (directory); ++ if (XFIXNUM (name_len) < XFIXNUM (len)) ++ continue; ++ else if (EQ (Qt, Fcompare_strings (filename, make_fixnum (0), len, ++ directory, make_fixnum (0), len, ++ Qnil))) ++ { ++ filename = Fsubstring (filename, len, Qnil); ++ break; ++ } ++ } ++ } + +- if (NILP (loadsearch_re_list)) +- { +- Lisp_Object sys_re = +- concat2 (build_string ("\\`[[:ascii:]]+"), +- Fregexp_quote (build_string ("/" PATH_REL_LOADSEARCH "/"))); +- Lisp_Object dump_load_search = +- Fexpand_file_name (build_string (PATH_DUMPLOADSEARCH "/"), Qnil); +-#ifdef WINDOWSNT +- dump_load_search = Fw32_long_file_name (dump_load_search); +-#endif +- loadsearch_re_list = list2 (sys_re, Fregexp_quote (dump_load_search)); +- } ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); + +- Lisp_Object lds_re_tail = loadsearch_re_list; +- FOR_EACH_TAIL (lds_re_tail) +- { +- Lisp_Object match_idx = +- Fstring_match (XCAR (lds_re_tail), filename, Qnil, Qnil); +- if (BASE_EQ (match_idx, make_fixnum (0))) +- { +- filename = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); +- break; +- } +- } +- Lisp_Object separator = build_string ("-"); +- Lisp_Object path_hash = comp_hash_string (filename); +- filename = concat2 (Ffile_name_nondirectory (Fsubstring (filename, Qnil, +- make_fixnum (-3))), +- separator); +- Lisp_Object hash = concat3 (path_hash, separator, content_hash); +- return concat3 (filename, hash, build_string (NATIVE_ELISP_SUFFIX)); ++ return concat2(Fsubstring (filename, Qnil, make_fixnum (-3)), ++ build_string (NATIVE_ELISP_SUFFIX)); + } + + DEFUN ("comp-el-to-eln-filename", Fcomp_el_to_eln_filename, +@@ -4494,13 +4474,7 @@ If BASE-DIR is non-nil, use it as the di + non-absolute BASE-DIR is interpreted as relative to `invocation-directory'. + If BASE-DIR is omitted or nil, look for the first writable directory + in `native-comp-eln-load-path', and use as BASE-DIR its subdirectory +-whose name is given by `comp-native-version-dir'. +-If FILENAME specifies a preloaded file, the directory for the .eln +-file is the \"preloaded/\" subdirectory of the directory determined +-as described above. FILENAME is considered to be a preloaded file if +-the value of `comp-file-preloaded-p' is non-nil, or if FILENAME +-appears in the value of the environment variable LISP_PRELOADED; +-the latter is supposed to be used by the Emacs build procedure. */) ++whose name is given by `comp-native-version-dir'. */) + (Lisp_Object filename, Lisp_Object base_dir) + { + Lisp_Object source_filename = filename; +@@ -4541,19 +4515,7 @@ the latter is supposed to be used by the + + if (!file_name_absolute_p (SSDATA (base_dir))) + base_dir = Fexpand_file_name (base_dir, Vinvocation_directory); +- +- /* In case the file being compiled is found in 'LISP_PRELOADED' or +- `comp-file-preloaded-p' is non-nil target for output the +- 'preloaded' subfolder. */ +- Lisp_Object lisp_preloaded = +- Fgetenv_internal (build_string ("LISP_PRELOADED"), Qnil); + base_dir = Fexpand_file_name (Vcomp_native_version_dir, base_dir); +- if (comp_file_preloaded_p +- || (!NILP (lisp_preloaded) +- && !NILP (Fmember (CALL1I (file-name-base, source_filename), +- Fmapcar (intern_c_string ("file-name-base"), +- CALL1I (split-string, lisp_preloaded)))))) +- base_dir = Fexpand_file_name (build_string ("preloaded"), base_dir); + + return Fexpand_file_name (filename, base_dir); + } +@@ -5859,10 +5821,7 @@ The last directory of this list is assum + the system *.eln files, which are the files produced when building + Emacs. */); + +- /* Temporary value in use for bootstrap. We can't do better as +- `invocation-directory' is still unset, will be fixed up during +- dump reload. */ +- Vnative_comp_eln_load_path = Fcons (build_string ("../native-lisp/"), Qnil); ++ Vnative_comp_eln_load_path = Qnil; + + DEFVAR_LISP ("native-comp-enable-subr-trampolines", + Vnative_comp_enable_subr_trampolines, +Index: emacs-29.2/lisp/startup.el +=================================================================== +--- emacs-29.2.orig/lisp/startup.el ++++ emacs-29.2/lisp/startup.el +@@ -545,9 +545,6 @@ DIRS are relative." + (defvar native-comp-jit-compilation) + (defvar native-comp-enable-subr-trampolines) + +-(defvar startup--original-eln-load-path nil +- "Original value of `native-comp-eln-load-path'.") +- + (defun startup-redirect-eln-cache (cache-directory) + "Redirect the user's eln-cache directory to CACHE-DIRECTORY. + CACHE-DIRECTORY must be a single directory, a string. +@@ -558,22 +555,10 @@ to `user-emacs-directory'. + For best results, call this function in your early-init file, + so that the rest of initialization and package loading uses + the updated value." +- ;; Remove the original eln-cache. +- (setq native-comp-eln-load-path (cdr native-comp-eln-load-path)) +- ;; Add the new eln-cache. + (push (expand-file-name (file-name-as-directory cache-directory) + user-emacs-directory) + native-comp-eln-load-path)) + +-(defun startup--update-eln-cache () +- "Update the user eln-cache directory due to user customizations." +- ;; Don't override user customizations! +- (when (equal native-comp-eln-load-path +- startup--original-eln-load-path) +- (startup-redirect-eln-cache "eln-cache") +- (setq startup--original-eln-load-path +- (copy-sequence native-comp-eln-load-path)))) +- + (defun normal-top-level () + "Emacs calls this function when it first starts up. + It sets `command-line-processed', processes the command-line, +@@ -1362,12 +1347,6 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + +- ;; Amend `native-comp-eln-load-path', since the early-init file may +- ;; have altered `user-emacs-directory' and/or changed the eln-cache +- ;; directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + ;; If any package directory exists, initialize the package system. + (and user-init-file + package-enable-at-startup +@@ -1502,12 +1481,6 @@ please check its value") + startup-init-directory)) + t) + +- ;; Amend `native-comp-eln-load-path' again, since the early-init +- ;; file may have altered `user-emacs-directory' and/or changed the +- ;; eln-cache directory. +- (when (featurep 'native-compile) +- (startup--update-eln-cache)) +- + (when (and deactivate-mark transient-mark-mode) + (with-current-buffer (window-buffer) + (deactivate-mark))) +Index: emacs-29.2/src/Makefile.in +=================================================================== +--- emacs-29.2.orig/src/Makefile.in ++++ emacs-29.2/src/Makefile.in +@@ -553,6 +553,7 @@ shortlisp := $(filter-out ${shortlisp_fi + ## We don't really need to sort, but may as well use it to remove duplicates. + shortlisp := loaddefs.el loadup.el $(sort ${shortlisp}) + export LISP_PRELOADED = ${shortlisp} ++export NATIVE_COMP_BOGUS_DIRS + lisp = $(addprefix ${lispsource}/,${shortlisp}) + + ## Construct full set of libraries to be linked. +Index: emacs-29.2/Makefile.in +=================================================================== +--- emacs-29.2.orig/Makefile.in ++++ emacs-29.2/Makefile.in +@@ -329,6 +329,7 @@ TRANSFORM = @program_transform_name@ + + # Prevent any settings in the user environment causing problems. + unexport EMACSDATA EMACSDOC EMACSLOADPATH EMACSPATH ++export EMACSNATIVELOADPATH = @abs_top_builddir@/native-lisp + + # What emacs should be called when installed. + EMACS_NAME = `echo emacs | sed '$(TRANSFORM)'` From patchwork Sun Jan 21 14:09:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59486 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 59D9327BBE9; Sat, 27 Jan 2024 20:59:23 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BE41927BBE2 for ; Sat, 27 Jan 2024 20:59:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplU-0004uN-1n; Sat, 27 Jan 2024 15:59:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplP-0004sY-Uc for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplP-0005qR-N4 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplW-00056F-UY for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 4/7] gnu: emacs: Disable jit compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911219526 (code B ref 67260); Sat, 27 Jan 2024 20:59:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:32 +0000 Received: from localhost ([127.0.0.1]:56040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl1-00054k-4D for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:32 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:52634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053X-Gp for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-5100409e31eso1997354e87.1 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389085; x=1706993885; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=T9WgV3yEn+7iYq7JNRJetMek5jTB7fFb8Bj6IqZws6jxMoiyjYVyxFT93tsMYuUazg H3TJf0drbTQiHGJqtpAxCwtTfuivmlNxFmN2+Oy5p5JUslHGAC2W8sr7hBNOZCCUaIB0 4980z+sm8GvD3bzB8lhGFMsgMb0vjFKAEtoyILi9fK51wo2YI/UqrmW54nB32cyZPwWc Ke6mB25r0Ufz0N8TJfWLjHzz6ewb1vpJET9d7Kc5Yjpr1Boo4o7OV8MNr/khBT/871Pt 69iXcVJXDysJjCwIP+CMppU8HSuboqdQWfVqjqYMlbGOaegkx9v+WBHuMmbufTyFiEKk IQBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389085; x=1706993885; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/ctDrNEzJER0S3sPc26a6mQerVd1gaaaswhlexld1dw=; b=LLtX8HF1NjobfaPqMwRuF29PayJlq3gyT7DnLcM+uVChQ+mcGOcmrugbhCOPsex+5z 4xqe7lMNZ+d4NOxx9F2/XhJBs5I1uKZJX77dDbhrCC9ZsFcH4Ujlu2WBk+TYQm2hqTp+ c5N9OxXckDe35KWVybMoSUHW2XneWKgQGWgb1T0CZm7+5Cj7OjhZMw0ItmKCxDYsMWdq eJbYZH27+QNMaVdYeucAKiDr3j1AIm5qEEKK4qWr743y5rt1HezOnBMhYRsYTFEXJEUt EM4s/K5fJYjwYtR7ZZihmUQMRzZc14uN+855PsYYGHKF/I0hQA9kWpOdVKlZdgIV+2sI 939Q== X-Gm-Message-State: AOJu0Yz0CmnQ9RCkA6CeXBHupoMNn28rto+dqstvWPZ9DRpASvfppQYx ofoUF8XiB0mRLvrDV4W5iCd7t844YxBvJYAihObHcIc3a/n8nQwZ5nxfxCRQ X-Google-Smtp-Source: AGHT+IEgFVDgsmH1E/SGzpQo4t+B97UsLyuTZsn2JhOmqV9MYPUEsh/I9MF98OoOO8VeM5cjtCqTVg== X-Received: by 2002:a19:ac0d:0:b0:510:e05:4361 with SMTP id g13-20020a19ac0d000000b005100e054361mr1295721lfc.3.1706389085106; Sat, 27 Jan 2024 12:58:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:04 -0800 (PST) Message-ID: <2a1785ea1709b6bca18fb5c92a506cb373757186.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 15:09:47 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-disable-jit-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs.scm (emacs-minimal)[patches]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs.scm | 3 ++- .../emacs-disable-jit-compilation.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-disable-jit-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7e6a0c5006..9121f13b39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1112,6 +1112,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-elpy-dup-test-name.patch \ + %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 1caa2cbee0..03c50eba6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -108,7 +108,8 @@ (define-public emacs-minimal (sha256 (base32 "1p3h4sz8da8vhix5140g2qkdy8mz11d7mmvsym5vy847k1428gbx")) - (patches (search-patches "emacs-exec-path.patch" + (patches (search-patches "emacs-disable-jit-compilation.patch" + "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-native-comp-driver-options.patch" "emacs-native-comp-fix-filenames.patch" diff --git a/gnu/packages/patches/emacs-disable-jit-compilation.patch b/gnu/packages/patches/emacs-disable-jit-compilation.patch new file mode 100644 index 0000000000..8b1ac5a9df --- /dev/null +++ b/gnu/packages/patches/emacs-disable-jit-compilation.patch @@ -0,0 +1,19 @@ +Index: emacs-29.2/src/comp.c +=================================================================== +--- emacs-29.2.orig/src/comp.c ++++ emacs-29.2/src/comp.c +@@ -5648,8 +5648,12 @@ For internal use. */); + doc: /* If non-nil, compile loaded .elc files asynchronously. + + After compilation, each function definition is updated to use the +-natively-compiled one. */); +- native_comp_jit_compilation = true; ++natively-compiled one. This variable is enabled by default upstream, ++but disabled in Guix to better make use of precompiled packages. ++Notably, Guix removes the hashes that prevent inadvertent shadowing ++frm the file names of compiled libraries in order to facilitate grafts. ++Enable at your own risk! */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug"); From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59491 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B082927BBEA; Sat, 27 Jan 2024 20:59:46 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6304F27BBE2 for ; Sat, 27 Jan 2024 20:59:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplQ-0004sn-IF; Sat, 27 Jan 2024 15:58:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplP-0004sH-Db for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplP-0005qF-5m for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplW-000568-Cq for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 5/7] build-system: emacs: Compute relative file names. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911119517 (code B ref 67260); Sat, 27 Jan 2024 20:59:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:31 +0000 Received: from localhost ([127.0.0.1]:56038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl0-00054i-O6 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:31 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:59578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053Y-N2 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a33735d22fcso92473666b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389086; x=1706993886; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=K0bUKGc+W27nLKazJE9wfpZIjodQX+HWsYID+X04zIwMKnlsMfrscrozSIeqnqSKNS +KvVuVB6mllBoTUa7g46uIDRMIY76QLxtlwwDwQ6z5rSdt1t5LN+wN4nD75u5o49xky8 BsO1EvCj/eCAzUfcbsJjbIAQAuOtxYB8l5kEItqY1wNsqE9tkFE4YzyGclx5hRXM31x4 KGgDprnYNtOpNqvX5DgnOEVTdYEJkBMn65CJsltKedSb1yh4jtinvytPJddfN9YxcGqf hZEi1YecVxc4wcY8pbI5XeKH5vXKiO2rFrb6/yzuMQBOM2sInR3vmOW66h/2tJcgUQc3 TkPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389086; x=1706993886; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0U/kx38hU6RITJFZdXOOf+kb/k+R7e4plKDQ98s0YBY=; b=Suw7jX+AFuTUV9tqTXSKpXmQvr+sFSoWPSM/tigKipImlFiuH1zrNoZFvQVGzmut2j UhdU5TuJcTwkS+rLmhJmr5mOko0XD9EWbOYYjOhLlxdiAi9UdslsYwmg2k8+yxy768Hv BeAxPu75YT3h88iMvIacgBeCIK0ra0e+twhPJI1oZ61e0JURrGjifFWRmO7grtbNUCib RkqmGetODsiTTa+X/XMIG5kgOPWsi/Vn4WPBEDdzLdWbhkD/cr4DWx8YdeNVoKp3n+ld cu1WyFuP9oCvnqZC+YHb1is4BLVsRuh4aSd6N3rmhvJed4EBIS51t1EIWBZiWtY+8kD5 d/XA== X-Gm-Message-State: AOJu0Yw3M/kSi2FpCfDgBSlgelOt3C6GBxhGrzwDMGHfhE5zsO9SSeCJ q16NMRlArICMIHLjmrrk35aNzLD7SLKMfnkAtqVdZgP4zXeY9ZM+eIj8wxDWYqA= X-Google-Smtp-Source: AGHT+IE2gHBkKjidK3P1/tAoocRskFHlAo1T24EaFHq/X9UGpZextdbyP3XxsrVKA8M3kQo7Ne/IKQ== X-Received: by 2002:a17:906:34d7:b0:a31:6c5e:eb96 with SMTP id h23-20020a17090634d700b00a316c5eeb96mr1432982ejb.58.1706389085811; Sat, 27 Jan 2024 12:58:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:05 -0800 (PST) Message-ID: <45656b35960c59a586547bca0b9c80491a77a027.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches With the previous commit, relative file names are expanded relative to ELN_DIR -- more or less. To make use of this in emacs-build-system, we must also pass relative file names. * guix/build/emacs-build-system.scm (emacs-compile-directory): Compute the relative file names of the files to compile. Change-Id: I8983f80fb0fe1573e46748222403ba8873f1599f --- guix/build/emacs-utils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 8e12b5b6d4..eca42bf305 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -146,7 +146,9 @@ (define* (emacs-compile-directory dir) (cadr native-comp-eln-load-path)))) (if byte+native-compile (native-compile file - (comp-el-to-eln-filename file eln-dir)) + (comp-el-to-eln-filename + (file-relative-name file ,dir) + eln-dir)) (byte-compile-file file)) ;; After native compilation, write the bytecode file. (unless (null byte-to-native-output-buffer-file) From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59487 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 62D8F27BBEA; Sat, 27 Jan 2024 20:59:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF37B27BBE2 for ; Sat, 27 Jan 2024 20:59:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplU-0004uS-4r; Sat, 27 Jan 2024 15:59:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplQ-0004ss-Qa for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplQ-0005qf-Iq for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplX-00056U-Qy for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 6/7] gnu: emacs-org: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911319541 (code B ref 67260); Sat, 27 Jan 2024 20:59:03 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:33 +0000 Received: from localhost ([127.0.0.1]:56044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl3-000551-27 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:33 -0500 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:43124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkp-00053a-H6 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-55eb1f9d1f0so1220794a12.0 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389086; x=1706993886; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=V8GtmNOzQnFb2YmymIpmhqIifghNdN+PcmPTEgAm4lZVpbhpOYyDvdD1zoRx/eCTG7 +iO0GQDFeQGQ7DCAZQJCdctER1rko8W7boiDPJwGbNU/kjK/OZPOqHEwVggj5qtmdSsE LIX7OSYAecSmWSjSAPlKqTAZ+GZOMmf9+ajtWtb4fDEJAD+dKMSrbUcTYgqbyQaPgYqN PXu4FiYeeiI7+M3THZZy2qPAvDO5tP1PF4cjnRtzra9mW8lgKhHI/zKDH39ctGWxOqu2 T0dI7mSXpcgW+6WG6vFaEwbariwJbM9J/93n9VVlM02+VtN3Cdyy8/TSp9d6BC/gZil9 1tbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389086; x=1706993886; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P7SiF6YoaHTrKSIuxb1oY/v6N7pzNvBKFNML4lrbK3E=; b=TLd7IUUJmYXZpBKOok+4reROn5aKjujV3Bfe6ELjBsnfrbcoC0xMgNC1kL6cIISNYS b+Lu/o4i8w3gOsNmyPnIX36S5tx+6jDVekGS/o0/QArIq2Uhs3hKZZ66rxvWSyWt6gUO CQzwwRQN501K66a9Lk6LwrzCK0Y4j4uH/ViXiRn2lPg1CcSbhWRvRiX0oF7hhjs5OrjX ZekGyIb39XgbOy5CinuCp7aplZ+M69eNLwrdn9M4r6RNtIr91azTKQb2pBzdITRou3e9 MrbHwHAQ0R5TCEM2+N6QR/R9TpDQEK8nPp528yJXLsHyaWDrOFEnXYXGp/giVhNheLOM qxKA== X-Gm-Message-State: AOJu0YzLE54YhXrKNxsT7Hrbzj7Ci07Z+gkfqowl2TktO8PVulAWmZYX UeDIXnTiroaF/pleZCh0y9VLdqeDqgH3x/sE3SH50Hg4VpxQR+2amXPSxGTpBc0= X-Google-Smtp-Source: AGHT+IFGKdbjoy4+dRTYGARjmu8nmQhmhmt54FTS7ibJbAiL0uzWM+cIRrFKpemX0mI2l1r2UqmhOA== X-Received: by 2002:a17:906:ae4a:b0:a31:1820:5758 with SMTP id lf10-20020a170906ae4a00b00a3118205758mr2774672ejb.10.1706389086466; Sat, 27 Jan 2024 12:58:06 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:06 -0800 (PST) Message-ID: <8aeec12dcad684a53ca8ed955f74e9bd2dc8fb19.1706389058.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-org)[#:phases]: Wrap ‘build’ in a directory excursion to the actual lisp directory. Change-Id: Ifa10f9e91fe21cd4c34da11b68ddb77a03d847ca --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fc3c9e00be..e2aebe971e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16752,6 +16752,10 @@ (define-public emacs-org (substitute* "testing/lisp/test-org.el" (("test-org/org-(encode-time|time-string-to-time) .*" all) (string-append all " (skip-unless nil)\n"))))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args)))) (replace 'install (lambda _ (let ((elpa (elpa-directory #$output)) From patchwork Sun Jan 21 12:12:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59490 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7FC6D27BBE9; Sat, 27 Jan 2024 20:59:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1A26A27BBE2 for ; Sat, 27 Jan 2024 20:59:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplT-0004uM-QV; Sat, 27 Jan 2024 15:58:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTplR-0004tP-6a for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTplQ-0005qn-V1 for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplY-00056c-6q for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 7/7] gnu: emacs-magit: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Jan 2024 20:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911419548 (code B ref 67260); Sat, 27 Jan 2024 20:59:04 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:34 +0000 Received: from localhost ([127.0.0.1]:56046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl3-000558-Cz for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:34 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:57656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpkq-00053b-8B for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:20 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-40e7065b692so22054115e9.3 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389087; x=1706993887; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=da9Ald6g1jMgMz31JRjHHKeY4Jn/8i8pWUh7XYJ5EvUnBKeYRoj0FLwoa0vYXtSjPp hP4qNHaF4fRyvvKjNru0hjMHx49JCXZcqWTXj03gR3Lew2FiSx6cCwU5Gtdc/sR+AG7m TT+fEcvlB8vHWvc0//ASRHExYUeswZ1h/JNFbYplrWqY4OVWlUD+LHnrNKe3WEYcd9f1 7C96++IhZPZWpW1AUyxDPl2JDa1ocTMFqT44bMV/ohEY/B6oslW6JDWh7CQZewtIz9b6 LhCvoEhWoUx6dDYfKyTN5dHD5N+69OeNoE5S4X/jvr+t6xEZUCe+CdyBunMnwGIniKKh pkMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389087; x=1706993887; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4KFRKbx4HKXwjo2pBvChBXcG/zR6GOU4sAoGhyg2u4=; b=snDaiKx7Y0w57Eess6Ug5uDZrqTjZMM/yB06xkkSLEb8odO2wJ9187HzO7NDncmHB/ 1UTRg6AcMz07Ctw6lyn4Bt09NY/VJ13mPWKVgeC/FMokdqui901F0tzfHviiW9TAfYm+ o5Mkrve5zlpSkvmrqAimuhIhONV60jg8PUeRJ7ak5NDOt8/MQ8OuK3SB77aG6Yheqcke 9iMmitfvp4lbXH+xix7EGc3s+y6kreajquX6Au0somjcrBTaOZloxQ6pGp0Os1GFmY9/ 0yqoGIxHb+gLEIUzSwj37kjMOqdct0HROcNx5582GnRM6vJx63lVCIAs1d1QmFMLdraO hz8w== X-Gm-Message-State: AOJu0Yx1AaG/HmMPfpnQIY1q2OWXPMQhWgTVw0+KQGURi/i0yN5vei2v /Arqwj7dgWHtvrtD+IQ6MAkyuruFf+xM1/yXH3myD041AIQR1F8I1TnGl9zrRb4= X-Google-Smtp-Source: AGHT+IG0Dk4vqlM4cHmFuZkI6efxELewgCIXCgf6gzBDrPBKR97F80M/Og0FhxUtQggD2t2J9eMkag== X-Received: by 2002:adf:ab11:0:b0:336:613e:9e54 with SMTP id q17-20020adfab11000000b00336613e9e54mr1453353wrc.89.1706389087190; Sat, 27 Jan 2024 12:58:07 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:06 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 21 Jan 2024 13:12:42 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-magit)[#:phases]: Also wrap ‘build’ in a directory excursion. Change-Id: I332325989a1bbaa95552c2cbf50f336f0075c1c4 --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2aebe971e..a0ac8f5a57 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1590,7 +1590,11 @@ (define-public emacs-magit (replace 'install (lambda args (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'install) args))))))) + (apply (assoc-ref %standard-phases 'install) args)))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args))))))) (native-inputs (list texinfo)) (inputs