From patchwork Sat Nov 25 08:18:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 56816 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 16DBA27BBE2; Sat, 25 Nov 2023 08:24: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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 D5AB927BBE9 for ; Sat, 25 Nov 2023 08:24:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6nxH-0006QL-5G; Sat, 25 Nov 2023 03:23: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 1r6nxF-0006Pv-SF for guix-patches@gnu.org; Sat, 25 Nov 2023 03:23: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 1r6nxF-0003xq-K5 for guix-patches@gnu.org; Sat, 25 Nov 2023 03:23:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6nxK-0007mh-Gt for guix-patches@gnu.org; Sat, 25 Nov 2023 03:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v2 3/3] 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, 25 Nov 2023 08:24: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: Mekeor Melire , cox.katherine.e+guix@gmail.com, andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170090058529834 (code B ref 67260); Sat, 25 Nov 2023 08:24:02 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 08:23:05 +0000 Received: from localhost ([127.0.0.1]:37741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6nwP-0007l8-5j for submit@debbugs.gnu.org; Sat, 25 Nov 2023 03:23:05 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:56430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6nwM-0007ka-Kz for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 03:23:03 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-9ffb5a4f622so369824266b.0 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 00:22:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700900572; x=1701505372; 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=mSSkdOcBLgDMxvIhk/I0LXd3Ez3dZlfIMGxAVjyAo2XP2ybuIBSoyW8WRNrBSZYq81 GsldiU8HMQXMXm/O5orYXBCJSlisiY1PQ237KNm3kvWXZEfJCG/z6fGCzvifUVH8c7VG dX+Eh7hoabs+nTmjGfylCPjMmrMnbwz9HkvqJVNQ1c5+dn1wu0l0FhbMPv9UP/1SvYJs FMvIOrhMoWw8MIRTxGR36NjVe4/8eoAvt0Z4QRtPzqsaf5R2+u66i4w79QfmbbjbkGU4 WTDehFtw6yLLLy7vBYacpCGWqRFHWwvbUwDrZoOmp3zlrLu/ycgQq6vm5aUPBO6Ks82Y f49A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700900572; x=1701505372; 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=YMT1BNTILQ+aJV63apmZ0P0SoY/DLWYCcsWDHftLBTa15tpwnCbPdXhO0QW8mwDfex t4WwWgAbD+6Mmgs7Z37c3gD5CHTqPgiyjkNu5kXkZHbkc2cLpuAHN3Qi2N7tI5eGzqP1 mpJ6pQrXHybxE1k8dlxLdI0zSo7uu2rwM0IwArLXYogG7dY/gfz0PTJNrb6R9f0Eisqa eyAtmyCYbqVnqkzOLVvQq3XxsIGFT1UuLBvZnEjs/E+KSnBqkDSSSFF+RypuXN3wd3KZ lhgbDtAl82NkdiWVtTvo9FvDBKA9ZBWKbG3+oSDCSUXz6UvvKLYeFwp3Dp2dQoRdL7ni oHmw== X-Gm-Message-State: AOJu0YzZPc75g+SaHnXUJ/6IMQYtncn1iN7S+9cP0D4V1jLrJdTm9Rex NBPgVMjs6HX8Y4tzb9+BN0KvEyYpvj+gig== X-Google-Smtp-Source: AGHT+IG8xJsQ9UMQ32qt2/w6JSoLUhbw9R91usP8rlvsQ3eCi1Pbqz6CPUQs6p+jfASzD8IqvKmh5g== X-Received: by 2002:a17:907:2992:b0:9ff:2374:1571 with SMTP id eu18-20020a170907299200b009ff23741571mr3193293ejc.69.1700900572009; Sat, 25 Nov 2023 00:22:52 -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 kq4-20020a170906abc400b00a0b7304c368sm606269ejb.89.2023.11.25.00.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 00:22:48 -0800 (PST) Message-ID: <28de2575a98876bed2c1c2762871639733d75a9f.1700900541.git.liliana.prikler@gmail.com> In-Reply-To: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com> References: <190e882ba2705f244b04231112a9926e9dcebc29.1700900541.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 09:18: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 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)