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: 59374 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 E36BB27BBE9; Thu, 25 Jan 2024 09:31:50 +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=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 D353027BBE2 for ; Thu, 25 Jan 2024 09:31:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSw4n-0008Pd-6h; 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-0008Ns-8Z 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 1rSw4X-00020p-1f 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 1rSw4c-0007cB-NM; Thu, 25 Jan 2024 04:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v6 4/7] 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: Thu, 25 Jan 2024 09:31: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.170617502929185 (code B ref 67260); Thu, 25 Jan 2024 09:31:02 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Jan 2024 09:30:29 +0000 Received: from localhost ([127.0.0.1]:47320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw45-0007af-2f for submit@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:29 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSw3v-0007ZU-Sp for 67260@debbugs.gnu.org; Thu, 25 Jan 2024 04:30:20 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a271a28aeb4so697742266b.2 for <67260@debbugs.gnu.org>; Thu, 25 Jan 2024 01:30:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706175008; x=1706779808; 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=jRrFZD+oBGw4udYnzZZPBa9oyN1WDFPd/834RCsbwJoNonxXawW/dPE1eTh8bQQDrS BLuftU2ovJVhZHFigBJk7vmf3Rm74EV6UhxvTtkbpgeedgdkAfynRx4aGzEdzHzdABLv EV7ISe7aVPW3Q047J+g4DJJzmh0J0MJ6U+Vkeq0iyUblSLZVBhjKfnNMLKfVP2Ir0/WF A+Lhq+H1Fz/wPASbc7WdCqgFWcxku/FCPMU3bCBpC+O55xncbJ/9/VGZXkxUiMdijU8w wSgZWcqljNf7YKge35mJEsiDHZaF4hUpBbuhm9fr422HLMvivKDIVTkruHU0BwKmfALz +2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706175008; x=1706779808; 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=KQVTLKu+daziWiMEVsnoLLdasVCvr9TIGtu/TPpk/Qe5HggEDXdcgjIrswIaVbP8Vl TaWNLnnqmVzFz1LMxHw6BAck86R72XMtiYthsM92NuamQeE79RM5kYXw6P5aGct6NWuz 8TkonWq8s8gkzQZPO4d0w2zIr4E2T+Z12DUktP47vGIfUqi45bnGGvXD8sKi0RmTEtBY cA/Wwuzkk8xCg5G3aHfuQi9mFtGNs06H6rjkApBzuIBBak6DAZ2Xz7jJAAOsgEmfe2rz ITV8T3tXALFeHopqW96RYUTF3KSns8IYR5UkpPnxYk/imPR/4eDiKByYa6fMV7z3Y5Gd F6CA== X-Gm-Message-State: AOJu0YxUMV6jEzGDGi4eGa6yXnz8hWXbWRlwmLT7g+L14IPTWti9YvsM iRL6JOQcOZWBxzA1FyYZ+natktNdYJk1nS6S6ZhNEaICybovGIqQEEkCz1QBpr8= X-Google-Smtp-Source: AGHT+IE1P3M0juWJc3J3VGBfMu5gRjQNrASbQfFkj8/3tqjJHw9JCyaBD8vfDuyHf3zuAzU2TKUKeg== X-Received: by 2002:a17:906:707:b0:a31:7bb2:96c4 with SMTP id y7-20020a170906070700b00a317bb296c4mr327978ejb.150.1706175008303; Thu, 25 Jan 2024 01:30:08 -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.07 for <67260@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 01:30:08 -0800 (PST) Message-ID: In-Reply-To: References: 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)