unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 67260@debbugs.gnu.org
Cc: Mekeor Melire <mekeor@posteo.de>,
	cox.katherine.e+guix@gmail.com, andrew@trop.in
Subject: [bug#67260] [PATCH emacs-team v2 3/3] build-system: emacs: Compute relative file names.
Date: Sat, 25 Nov 2023 09:18:26 +0100	[thread overview]
Message-ID: <28de2575a98876bed2c1c2762871639733d75a9f.1700900541.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com>

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)
-- 
2.41.0





           reply	other threads:[~2023-11-25  8:24 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com>]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=28de2575a98876bed2c1c2762871639733d75a9f.1700900541.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=67260@debbugs.gnu.org \
    --cc=andrew@trop.in \
    --cc=cox.katherine.e+guix@gmail.com \
    --cc=mekeor@posteo.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).