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: 59268 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 95E4327BBEA; Sun, 21 Jan 2024 14:15:26 +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=ham 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 390D127BBE2 for ; Sun, 21 Jan 2024 14:15:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbJ-0001uc-Bv; Sun, 21 Jan 2024 09:15:05 -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 1rRYbH-0001u3-R1 for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:03 -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 1rRYbH-0003F2-HU for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbG-0002tx-Bl; Sun, 21 Jan 2024 09:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 1/6] gnu: emacs: Build trampolines. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584648611067 (code B ref 67260); Sun, 21 Jan 2024 14:15:02 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:46 +0000 Received: from localhost ([127.0.0.1]:36801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb0-0002sI-2Z for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:57471) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYav-0002ro-JQ for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:45 -0500 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-557dcb0f870so2626637a12.2 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846472; x=1706451272; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=e+chlrNWE9AR0xlk2sD1TTalP+/KHw6juW3q1UdAJeg=; b=f+ZGv71DxrnNu2as4xOjlo1TjfAA33hyhBCqHrB5Od1d5UfIbxkKY2ISf6BnZc0XDD 55vr54NUmHwUWsn8aNWGEnUE121FPhzyJuRLelACnS9yaeyFRA1SlzA32amrRBTZ50+c Pn2GlPu0uOCOYESnK8fZKzNzSdAf9hbtpqwTFxU2ky3ZJdJXQ8rFswGYWjY8KoUdvhL0 n2bFMudgUpF3cF0Juo1HONfIP2T2c1ST0WwbnNYpnMF2yKutLSczPvM5cgY22XsrnpdG ylYZS/ZC639qw4smNXxD1VizSddVwgJ/TVkitkFTaZk3/d8surbXZHNTydr9cQKNjFd9 zwZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846472; x=1706451272; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=e+chlrNWE9AR0xlk2sD1TTalP+/KHw6juW3q1UdAJeg=; b=fbGrTNAWFdjEt42jYhUJ5fVMwCPd5+zoITKKGsQTq199kVNsfvvgvhhbWJ0sQBf39Y 9ahmEpP9+4BPdiErO1yUW5d5FVT7HZZasb52Yyfa790NvcgnN+0ep3YREzqzU6tPATM8 07KxaeqTOaV9niQD7vP/G4BQLI7SnjLaH23lJc40ibYEDghDUgM7xREnmVej26AvDv/K naN8/W2QmOa8uxyYld7VTDKlRTrEb/xYI7KNPLdUJq0yEfpOAL6x7tP8HkRM49qaRUlB v+2lwb2GIc2hRn/Qd+VyI+CD5+PAesgap/xQ3fRGYwPdUpmbjvTcbLh8/3yI0AYYWTI1 +h0w== X-Gm-Message-State: AOJu0YyKuygod/sImg52gqcTiBGUiTiXV5Wg+1w+6hP9P9fFl9UWFW0S LT4OB9/+JWDHcdNZmXQ/lZJDw27EKawPWZl1nQZyVCHGVzuo3sL3Cpa4gLX6OHY= X-Google-Smtp-Source: AGHT+IGketHYXT+9hor53w4q1WddxotX5c+DbDyO7G60C7xhE3rXPkkkIKnoGnLEZNRNgO6C2rS8fg== X-Received: by 2002:a17:906:c0d0:b0:a2e:70b4:28b0 with SMTP id bn16-20020a170906c0d000b00a2e70b428b0mr1331338ejb.3.1705846471855; Sun, 21 Jan 2024 06:14:31 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.31 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:31 -0800 (PST) Message-ID: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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(-) base-commit: aae61f54ff6acf5cc0e0355dc85babf29f625660 diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5f27c551e0..e4119ec21d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -376,7 +376,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: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 59267 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 1D98527BBE2; Sun, 21 Jan 2024 14:15:25 +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 D4B7327BBE9 for ; Sun, 21 Jan 2024 14:15:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbF-0001rh-B2; Sun, 21 Jan 2024 09:15:01 -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 1rRYbE-0001rT-7h for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:00 -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 1rRYbD-00038D-VC for guix-patches@gnu.org; Sun, 21 Jan 2024 09:14:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbG-0002u9-RR; Sun, 21 Jan 2024 09:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 2/6] gnu: emacs: Don't hash file names in native compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584649111094 (code B ref 67260); Sun, 21 Jan 2024 14:15:02 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:51 +0000 Received: from localhost ([127.0.0.1]:36803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb4-0002sq-Mf for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:51 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:47233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYav-0002rq-Uv for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:45 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a26ed1e05c7so242733766b.2 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846472; x=1706451272; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YBak83qGsVcl4xRuH2FK8JrBMV49823uQX60qaFWeE0=; b=lF0ItJ2Kb6ZfifICRDGjPTxD3Um90HBfgUg3msuAzkS1eEsyFCjpzTbkTZE/tE68lv tv6lu6fUuhZRVJ3aTnzQYRRl+QxuPFDsUzseeG9TdstfwxDhKfcT55O/TRYSCDLIICOH xEm9gLVlmb9B5Tsvpk3gDQwk6XVvSRRTrzeVZlt3RuIwEbC1ShTH5cFCEvEDPBdMqvQq oGz9L4EzEbI4xDYzkBlduA1dECC1xIVjZhTadA5h9QMbf1+ACsamhQRcDo+uIlL4Ovc3 RK+h0Rt4KxNME9rT34LCCKWwdmGxoMsqhLE74nS4wdM6BYoQLIWuP6KIv97Ene9b9x8n CtXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846472; x=1706451272; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YBak83qGsVcl4xRuH2FK8JrBMV49823uQX60qaFWeE0=; b=KCsRWwvlFHqpVEeW3/s7lSoecKeD9GzBx+CfQT2juFeaDhwCdKPWM/Gud0k4nsgujW LWsT3wT7dCUvDHVXQVtw2PltgiCIOaQEpDzJLzKsBxRr2F94akB2FHnuwOCfpyD7Y33e Yp7xphyY8FL8qy4d7+I3oiv4PNgMbNBdg1Oe3K8BW5a3TmldphvpFnp8ufl3YfJIBzHk mHtCxAVjz8L28QvSlppmpGi+TPYXZsAZlqOYulGSI41ZkgexO7q1+2Of5L5nLvO6d/sD V6AuoMXW242wpcbnM/ft8F+Z3hJd0eOD7D1XLN7K38z7tC3oJN4dPOKrk/ltIIbx3zM1 bf/Q== X-Gm-Message-State: AOJu0Yyb4H5HCcYU5T1U2GZFxmoOQ1Jf/LIwdUClyNgn1IOTM38eDKi/ jYLgEn+/R3glzuhSDnoiIGH8/hwXYbUQlIlsx+ukEFqClyrEJ1EM1DX9EG8GsDA= X-Google-Smtp-Source: AGHT+IH5pVyfYgS7+oUtrebL7jedlg3RaMa7V1kSo6f4ouJ/LJJY+fFDCaSHDUBoZqtiXc7C+1Lafw== X-Received: by 2002:a17:907:f90:b0:a28:32ff:8709 with SMTP id kb16-20020a1709070f9000b00a2832ff8709mr879749ejc.15.1705846472520; Sun, 21 Jan 2024 06:14:32 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.31 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:32 -0800 (PST) Message-ID: <388d3766e6908331c0704687141f33aeae7ee969.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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 | 197 ++++++++++++++++++ 3 files changed, 199 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 e4119ec21d..182de0204d 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..714b707e47 --- /dev/null +++ b/gnu/packages/patches/emacs-native-comp-fix-filenames.patch @@ -0,0 +1,197 @@ +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. + +Index: emacs-29.1/src/comp.c +=================================================================== +--- emacs-29.1.orig/src/comp.c ++++ emacs-29.1/src/comp.c +@@ -4396,26 +4396,18 @@ 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. Further, if the NATIVE_COMP_BOGUS_DIRS environment variable is set, ++the first matching prefix mentioned in it will be stripped as well. */) + (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 +4415,53 @@ 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); +- +- if (suffix_p (filename, ".gz")) +- filename = Fsubstring (filename, Qnil, make_fixnum (-3)); +- +- /* We create eln filenames with an hash in order to look-up these +- starting from the source filename, IOW have a relation +- +- /absolute/path/filename.el + content -> +- eln-cache/filename-path_hash-content_hash.eln. ++ Lisp_Object tail = Vload_path; ++ Lisp_Object name_len = Flength (filename); + +- '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 (loadsearch_re_list)) ++ FOR_EACH_TAIL_SAFE (tail) + { +- 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)); +- } +- +- 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))) ++ 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 = +- Freplace_match (build_string ("//"), Qt, Qt, filename, Qnil); ++ filename = Fsubstring (filename, Fadd1 (len), 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)); ++ ++ if (Ffile_name_absolute_p (filename)) ++ filename = rel_name; ++ ++ Lisp_Object bogus_dirs = ++ Fgetenv_internal (build_string ("NATIVE_COMP_BOGUS_DIRS"), Qnil); ++ ++ if (!NILP (bogus_dirs)) ++ { ++ tail = CALL2I (split-string, bogus_dirs, build_string (":")); ++ ++ 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; ++ } ++ } ++ } ++ ++ if (suffix_p (filename, ".gz")) ++ filename = Fsubstring (filename, Qnil, make_fixnum (-3)); ++ ++ 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 +4475,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 +4516,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); + } +Index: emacs-29.1/src/Makefile.in +=================================================================== +--- emacs-29.1.orig/src/Makefile.in ++++ emacs-29.1/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. 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: 59271 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 3493E27BBE2; Sun, 21 Jan 2024 14:15:43 +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=ham 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 7E8D527BBEA for ; Sun, 21 Jan 2024 14:15:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbG-0001tR-Jl; Sun, 21 Jan 2024 09:15:02 -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 1rRYbF-0001ry-G5 for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -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 1rRYbF-00038X-67 for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbI-0002uo-K7; Sun, 21 Jan 2024 09:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 3/6] build-system: emacs: Compute relative file names. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584649311122 (code B ref 67260); Sun, 21 Jan 2024 14:15:04 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:53 +0000 Received: from localhost ([127.0.0.1]:36811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb6-0002tF-Ky for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:54479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYaw-0002rr-Ir for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:48 -0500 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a30359b97a8so24287166b.0 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846473; x=1706451273; darn=debbugs.gnu.org; h=mime-version: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=ba+WiP8PAJ8N2tq5L2/gk2wlxlbf2AMjL+iA4EzmCQGw8ubQGumsiA/7C2wEnJv6Pe 1wh5dqIHLE1huUQya10JGSSqK3dPlhfhBSz9UAbVBWozuHk4E1MaurkgRnQa3N16s0B7 X6lzFGWWfn76XCsbM4i1KXvfydhf7/h9pn4RhsLrneyLteTCfeGhSEJfPycc2M6xqR3v 6E8KSLj2PYH1OKgfalmbAI2+FzAUyZIa5baJi6wm40PbLYeJnZbgjh+iQJ9S/8aD0Qe0 nX69BDk4lvXUjHGTsH/XaPbuW6XqWQJA0Vvf/70z2hFdQ7WHE395QwGUi6wHi4YX5nAG 4GnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846473; x=1706451273; h=mime-version: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=WeLl0asXW9ukTBMT38hLNP+Djl37FdNmD1FtQtuNAiJR6u0iB5I7uC7dHU6MJhorOh hLJxUG6Y3NsqLz80wAd4kqO8lBV7Pl45fQfaoz+CUXQLwxusMlzp6nuJcTnSL1Tb0tIw YH5dQBFjhm9k3Hpxq7oyQpEt/Hdjhwl8SrrSMiRorZHYFsrLhqN0V57PheJCoHklmZFr C43it84iYoSKBdmOEBlW9DbDp+ONKZcRzxRUuui4IFehCQ9fbvqByJJlfBsEqh8e6ZyQ OGeGqfB2ikxbc7IkdJsWEOOZRxN72Pz3hbMvxF/k4ouGtZHCj0Uox3QkG/v9LtH5tdXh zE4A== X-Gm-Message-State: AOJu0YwsEEfgdBwzNahUlcWPnGW7jigdcein5FFqucfo9nGwhkzAprW3 D78eW0l3s+bQorWpxivLG6cG3KI30q9BQWpnsPDbWmpsjD46ecEq14mj4WEM X-Google-Smtp-Source: AGHT+IGY9x1tvQl5sHgyigyh85iW5ID1lgNXw53hDSFBO0NTguScsETly9gdvKFezlSvMgFuahWdVw== X-Received: by 2002:a17:906:17c8:b0:a23:5c13:20ce with SMTP id u8-20020a17090617c800b00a235c1320cemr1263256eje.144.1705846473196; Sun, 21 Jan 2024 06:14:33 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.32 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:32 -0800 (PST) Message-ID: <4da49fbeb3bebc49b852e2f8d3af8655d7b55dba.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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: 59269 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 D0A7827BBEA; Sun, 21 Jan 2024 14:15: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=-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=ham 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 633A227BBE2 for ; Sun, 21 Jan 2024 14:15:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbI-0001uC-46; Sun, 21 Jan 2024 09:15:04 -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 1rRYbF-0001rj-43 for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -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 1rRYbE-00038M-RI for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbI-0002ub-7b; Sun, 21 Jan 2024 09:15:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 4/6] gnu: emacs-org: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584649211116 (code B ref 67260); Sun, 21 Jan 2024 14:15:04 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb6-0002t8-A4 for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:52718) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYax-0002rt-61 for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:47 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a2eb5c4dad6so156819066b.1 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846474; x=1706451274; darn=debbugs.gnu.org; h=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=bhgL/dKUFa7JqdorRBde9eo3pCL6NdLIjIs1XjbWP77sdp/7uaZySQrmlAV6UPemk3 FgoJqnvRDA/ksot0M7NAkRzCEqry5LFciVZEhOSGjeBZqlO80T3SGraQ+3vdQKJinZ59 93Zo2QcEUtNhDKyDHK8X8H90GVVFECyXSB4kXLOHZmzoqPAjXMa3pVqytMZzQE/+ZmH4 AzVrrGe1QZT6Ve4T3ll9TO5bZv5/xgN6igdepoe2Kj9VJ4XVUrMN0IxqvkZ52aU8JJVd 9OqkYSXxSGXLfh0hqe6kAfYxhilFm6U27SjnN2Wq3b2rwJbf7jsXMB4yghtijE6OIYbY osIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846474; x=1706451274; h=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=TVck0PoHVnpJG9GSjjmjRRXd2FGvZGYVHkuHMFcOL2FjpVZnHJNqscxBRPuv13IfV/ 1tyWXij0BqjKM4HrEFVT22Eymc1E6RJiVD95h4auHhMPDsaHSP9deUBlEB/++LQmtyzZ sTivNjlj8q4Yg2FXRB4DxXbbR7yJ9H2TCRbbI5zBz85F4mm07qNnHpZ0Es4mrD1hS+Jj vwcE/7nAdpzFFQwvNf4KjGNHucaFDfwWFAwAuu4/K5SmOidf7oBJYWcCqMcFxQ63TDJy UCbFK+aHL4pDGqzTzJ9vHQY5fHdm0xaYyK3/AuouQFbPleqYEQBxrph0fVJXZeKwYmpx SNaw== X-Gm-Message-State: AOJu0Yx81GzbPxpIgAdJrGncXCi+TKAmkCTXt8Zhhn6DmujJjgnV0ezK dsH7STvtks0n4wvBqgdOpWctLCXoayvI1AVCgRomrCewjRYJkWeijHZUlp4x X-Google-Smtp-Source: AGHT+IGuOGCE6MQHcgGq+jxQNUl4OqGpHLUMyRnLQXCS4Z9JkhZKSXQJmCnvYu5N16k46Gy0YaPzeQ== X-Received: by 2002:a17:906:d0cd:b0:a28:f8a3:5b61 with SMTP id bq13-20020a170906d0cd00b00a28f8a35b61mr1379731ejb.57.1705846473803; Sun, 21 Jan 2024 06:14:33 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.33 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:33 -0800 (PST) Message-ID: In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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: 59270 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 2E2CD27BBEA; Sun, 21 Jan 2024 14:15: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=ham 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 96BE627BBE2 for ; Sun, 21 Jan 2024 14:15:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbG-0001tS-KP; Sun, 21 Jan 2024 09:15:02 -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 1rRYbF-0001rn-AY for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -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 1rRYbF-00038J-1K for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbH-0002uL-ED; Sun, 21 Jan 2024 09:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 5/6] gnu: emacs-magit: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584649211101 (code B ref 67260); Sun, 21 Jan 2024 14:15:03 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb5-0002st-Hr for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:51 -0500 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:55775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYax-0002rw-GL for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-a2fbb646eb4so124886466b.3 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846474; x=1706451274; darn=debbugs.gnu.org; h=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=nBWG7WkQDzK3qdv8O7XcHb/EOXjaZ/ipWG7GpKuEmn7ofPA1lwQX3B3x3YMIouBgY9 Hvms36lu8pWczc4XoFkvO1ff3P0/7hzGftZaTWJqB1H+9Q6Sx3AOMoYYKQdoN8jtgP97 /+AHscMElvWmDytqHC64Q15zRjbaZCkJKOFrxvzVxLofckpNnJvZKif+hkxQRXNuqQoY 9PCYm+FL5CXgdEMHEkRvGP6aiuW5m5XZYNSbMP9bfMabwLYsE/uJHI99hrj/tHJSs1Uj IV5qt44WPqYo6wHDKm3pJgG9LWFXJi8jHLfxWgpMHtq2HVBPgGn/7jGiHxVqvsUNzAzj bVHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846474; x=1706451274; h=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=V6/u2eMxTjfxobVb/l1h2vFNOGFV6DXC1s5MbsV2vMRPza64FVFCn4Tz05UrGTBkE6 8+WmAwYTM1exPsq3b+H7U9K36B6aaPeYpJCnk6Po3kVrMIUy1dGus/HwLxn+V1167DSq XyarK6z4ihYE1G2lKFJC330AlSxNMnWnEEBvMiM7+vfwSPMVUvwQKaeXhSOFvvCZ4lWP WgXIs1mzMT4NXbhsOu4jzhYq3tVNmhmipm6Ld/oLu+3CVMfTasS/wvdQ3f5GJY0K6UfU ejmnkJg2jxa2I6BD7IRrLedpTXnbQ7VFqE7ZsFM3S2FGqoseQH2tKsmA9avS+NE+r3UF f7Ew== X-Gm-Message-State: AOJu0Ywts39OGOJjiGEEsKlpZmfYq3fSpBFBhTDUZ4UoFlNgFzZJHF1k G8LT1cpzxtqNFBcLE/WdhpQqN6QL2H8KHVALTS/6YYbOu4YjufzPA7LccmsEL+Q= X-Google-Smtp-Source: AGHT+IHZ7wzOpUjcQ/140VMAyzFY7TJ+K5AljbTctLZ8sJwkHQzxmw18UTbhkVDJV9o0cB4UNsOXWw== X-Received: by 2002:a17:906:d0cf:b0:a2b:ca83:1576 with SMTP id bq15-20020a170906d0cf00b00a2bca831576mr1355823ejb.85.1705846474395; Sun, 21 Jan 2024 06:14:34 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.33 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:34 -0800 (PST) Message-ID: In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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 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: 59272 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 649EC27BBE2; Sun, 21 Jan 2024 14:15:44 +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=ham 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 99AC027BBEB for ; Sun, 21 Jan 2024 14:15:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRYbG-0001tX-QS; Sun, 21 Jan 2024 09:15:02 -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 1rRYbF-0001rg-7V for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:01 -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 1rRYbE-00038K-Nk for guix-patches@gnu.org; Sun, 21 Jan 2024 09:15:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRYbH-0002uU-S1; Sun, 21 Jan 2024 09:15:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v5 6/6] gnu: emacs: Disable jit compilation. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 14:15: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: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170584649211109 (code B ref 67260); Sun, 21 Jan 2024 14:15:03 +0000 Received: (at 67260) by debbugs.gnu.org; 21 Jan 2024 14:14:52 +0000 Received: from localhost ([127.0.0.1]:36807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYb5-0002t0-RX for submit@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:52 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]:56584) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRYay-0002ry-Cf for 67260@debbugs.gnu.org; Sun, 21 Jan 2024 09:14:46 -0500 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-55c2cf644f3so336965a12.1 for <67260@debbugs.gnu.org>; Sun, 21 Jan 2024 06:14:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846475; x=1706451275; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=t2c/i1Zs9XL5zjP5zPnCrdVqoUM9vZIlic3GyG5TdYc=; b=kjJoWDV1CEIeTEDslaGUuzc1c+4H1bjrW7Bzbf1I/xIDkL2q37rmzNOLNQr86pQx2M KtxG32ufYqfwK/rq6NF8MyIXjatdZQ+qWZxMnIo8r/i5J7IZRwGo9LSILsSmL29W8nK7 uuwzk8AMR9mCDvD/HY78vu9RoeoArOK/aizUG6ubtWizsGtdkaUSLM/U5gxCcQ44YbxF FehBuqcdotAkbTOqIpOevDUMIkw1zFpFDRZMT17BQx9rVlC7P0OL9kkua9zqJZ4NgDod Z7Ug4WGWQDulrMx3YKYmaDDYGPmpUK2K1nksAKis+u4+5A8ThhD4h6jr/eD+N8OTl6sZ jBbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846475; x=1706451275; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=t2c/i1Zs9XL5zjP5zPnCrdVqoUM9vZIlic3GyG5TdYc=; b=f3iuGFccNbYKGErg40PKELQxVFCbLU4A7fVDEal61qLPD+3XRBm4b9TEsNSGJj1NHS ka7j4khjygePEROaGs8khnL8/SlfLYWkw9BL0hErRdE2tmMZYqek+L+l1d87FLZ3DGaF +sefv6Sm/EPpgwGno6F2Bebolvtro/U5FA1pzF1PH4x8ey9aXwiJJZV3hUgSXGdn12lT Hr+UCyHlsrjg5OFVWdpGw/aMLohwGujk05xB2LBQhk3ZgJrI7iOVdns0M1QYO8Tn16Uw yJj4Rvy4L6r1IFKCnCsEU3cie0GjJXt075h/zK8gRXR+fEnrlHv35XagmYy9w9ieVln7 1Zbg== X-Gm-Message-State: AOJu0YwGlHejWHmebA8e7rInscZoQPFMtvMc6dSc1v/Rbzwax+abkylC gRCK23kMcRSoyFVcIaUyLQk6iWXVjlb5HMnx096exfhZUTgLMCGMGRK80JIE X-Google-Smtp-Source: AGHT+IGJWDujW7cF6pgr+iBYtuMfkXxQVRWQRhdBDqSvA34VbqSCIUcazmdhjeBtAP25kg+JE67+Aw== X-Received: by 2002:a17:906:b88c:b0:a2c:cdd7:bdee with SMTP id hb12-20020a170906b88c00b00a2ccdd7bdeemr1429907ejb.132.1705846475034; Sun, 21 Jan 2024 06:14:35 -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 f1-20020a170906c08100b00a28fdd21763sm12410228ejz.134.2024.01.21.06.14.34 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:14:34 -0800 (PST) Message-ID: <0e8f58759ef025b3fc010b021a157a80babfea18.1705846445.git.liliana.prikler@gmail.com> In-Reply-To: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> References: <24d0c763983a33d62027d70af67118b9821bdc26.1705846445.git.liliana.prikler@gmail.com> 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 182de0204d..c83d6114ef 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..3320fda779 --- /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, with this switch enabled, Emacs will recompile libraries ++that were already natively compiled with Guix, so use it with ++caution. */); ++ native_comp_jit_compilation = false; + + DEFSYM (Qnative_comp_speed, "native-comp-speed"); + DEFSYM (Qnative_comp_debug, "native-comp-debug");