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)