From patchwork Mon Jan 22 20:21:26 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: 59376 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 2EFFC27BBEA; Thu, 25 Jan 2024 09:32:03 +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 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 51F5B27BBE2 for ; Thu, 25 Jan 2024 09:32:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Q6-Fp; Thu, 25 Jan 2024 04:31:13 -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 1rSw4c-0008Nv-AM for guix-patches@gnu.org; Thu, 25 Jan 2024 04:31:02 -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 1rSw4W-00020k-95 for guix-patches@gnu.org; Thu, 25 Jan 2024 04:30:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSw4b-0007bu-W3; Thu, 25 Jan 2024 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 1/7] gnu: emacs: Wrap EMACSNATIVELOADPATH. 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: Thu, 25 Jan 2024 09:31: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: 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.170617502129150 (code B ref 67260); Thu, 25 Jan 2024 09:31:01 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:21 +0000 Received: from localhost ([127.0.0.1]:47314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3w-0007Zy-Oj for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:21 -0500 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:58372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3u-0007ZN-EB for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:19 -0500 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-a315f43ecc3so71050266b.0 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175007; x=1706779807; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=XAIFmQpn3YH76LVPjDq/zbWlXDLPt4PPeSpYYj2WQKSENr0tQyUYECUs+YETBA1+5p AmRpeEqT4VaM0bKn1mXSbj8Bg4NrJTr4mbZuKJuNqmmnU2Hf63vn6XlbNZhp9yZIvq8a gJkaRywdjw5leuSyshkDabDCaDIcQjzh9Z8/sgnnqj8ecJAbMQ3BPKrJPwcJKygtmcQ4 OzzUvOCjj0vpZKrYNkNsVn+Gvb3iOOsDCJrAFFyk7WGlkWOcymfomCjtYkW9ej+25+Ph k6sbW+YX7b3tJXT3SUAKTZFffLZFgm55AO5poaJ7f4X91wtw027DiWNUcfGHb9IJU5Vd 9G2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175007; x=1706779807; h=mime-version:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=op5+qAXkZvZoZO/tiwt0Qwd8FTa7QiK4YVFY9U0fXHg=; b=dF2T6xbfQupU0CVg9/mRIqlGRNq2nlcoQiSOTZlwPq8dWhhw8ke+3tLeSfYN9RidhN ehdt/Q9e//yhPNNXA90io0ek7OrB6wU8lTcgE78NPesh8Z6hc+RcBEVy16deG/rItYXr 2D46BLuWMmUOpjiAQkVcFkPemC40juZF2hawhzTGR7m3H8CISiJaDiS7007B7D/iThYj wQmWzSbBDJlc2DWdHjx9D29bc++EMXYJ+vW6b4RXggkK+nTlvQqoRAtBN8I3pXkayd2S B6zcPuzUu1ZKhtjiS6w9xcI0/UwutNAabBoIkgMe69X6ux3g4AYcwjA1vpUQ5hWvQrPC MTzA== X-Gm-Message-State: AOJu0Yx2OS0ctCd707OS3nI02A6R42CK3DjOy3QPjpVdmg9hYSrb6nSP f9OilqY99a8vZUZei//jXbYgpCx+iZ/KovpzWDZLaIiCPKq8gOfdpWlOyMDMfI0= X-Google-Smtp-Source: AGHT+IHn3i7uLwXB3626T3slO2n1AIN45qXiLI3F8wvSS1XxZZw+8gH5mkeY2wFDP8DOq7vSPM/Eog== X-Received: by 2002:a17:907:d30a:b0:a31:7c6c:a997 with SMTP id vg10-20020a170907d30a00b00a317c6ca997mr241111ejc.98.1706175006604; Thu, 25 Jan 2024 01:30: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 r11-20020a170906350b00b00a2af287c6b8sm843355eja.16.2024.01.25.01.30.06 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:06 -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. --- Am Montag, dem 22.01.2024 um 04:36 +0000 schrieb Suhail: > Suhail via Guix-patches via writes: > > > I don't believe this patch is sufficient.  It seems that the > > variable 'native-comp-eln-load-path may also need to be tweaked. > > The path to the "native-lisp" directory needs to be specified > > absolutely to make it not be dependent on the invocation-directory. > > Or it's possible that a patch that ensures that > 'native-comp-eln-load-path contains the absolute value of the > "native-lisp" directory obviates this one (6/6) in its entirety. This was the most cryptic hint towards the actual issue, but I've managed to resolve it anyhow. We still shouldn't enable jit compilation however; I've updated our reason as to why. 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