From patchwork Tue Feb 13 18:30:50 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: 60281 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 A3C1027BBE9; Tue, 13 Feb 2024 19:32:40 +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, RCVD_IN_MSPIKE_H4,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 9D12D27BBE2 for ; Tue, 13 Feb 2024 19:32:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rZyW2-0007te-HD; Tue, 13 Feb 2024 14:32:26 -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 1rZyVX-0007qx-KI for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:58 -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 1rZyVN-0004Gh-Us for guix-patches@gnu.org; Tue, 13 Feb 2024 14:31:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rZyVf-0004GB-G7 for guix-patches@gnu.org; Tue, 13 Feb 2024 14:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v7 5/7] build-system: emacs: Compute relative file names. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Feb 2024 19:32:03 +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: cox.katherine.e+guix@gmail.com, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170785268416271 (code B ref 67260); Tue, 13 Feb 2024 19:32:03 +0000 Received: (at 67260) by debbugs.gnu.org; 13 Feb 2024 19:31:24 +0000 Received: from localhost ([127.0.0.1]:47411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyV2-0004EG-C8 for submit@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:24 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:54461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZyUw-0004D2-Bu for 67260@debbugs.gnu.org; Tue, 13 Feb 2024 14:31:19 -0500 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a3832ef7726so564141766b.0 for <67260@debbugs.gnu.org>; Tue, 13 Feb 2024 11:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707852595; x=1708457395; 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=cGWrrSYNEVAOevKGkjDPbT2MejlDiD3jPVeFtWlPW7c2f6wgbyguqdidnANHIK8EA5 GPTmZdJj/DF10wApSjBfYyOeaKpNX9g1/V0K9DJI7q9sZNyi7TDfKDHTlKOlSPWNC3Vk SQeFm1NjqoCjNGPo/l+BnrPJZAe3QppRVHJTu2uv55ORcKlHVbTAT3Jz0QPFCH2qNBEF yqnYttH0cQ+g3gFZuc8bTbDi+fGsiT4wN1UHiBXliGrjt9Chiuqa8sSKGwVZzZ9e6sZT NPJocpvOtH7TB5IflmQ+XKEJQidzEdD2PmXwP3UBOHSCHpSkI9g4p+iNAZyLaa1qwG0C tL5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707852595; x=1708457395; 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=eYxltGf+FU2H7WqkEMhVUdiv2VxFXTsFX3iPBGV34oAckBxYPhjBjjOnKXydshxSJR ZT1mh93PFfXSM6oNlVTMTILho/LzuuLXu72P8CHk3DStsPhDPsMNa+hZSiKD07RhMFFq 1a+HNWELGfpZV6HtZzh6ZKeJ1pGPbHL13B/h8QPFbVC1CXNN0btV/LEAvCYfAQi+4KGo QG4Y5gXwvU5xoqHTfzAkuHA18THLz+QZh1Q6B3ka1sFwm7fSPwJSEgeBnnQsP6wIaelo BzNd/Y12hy56+u/6cpofAFTQ/V+4oBBdNwSm5ENY8/XhsRY8hRFssX1KmJxjUnZnBJ5R Dzmg== X-Gm-Message-State: AOJu0Yz/IeScWcR3xuZsti1YyXC+UFguluZDsj5BQD2tphEUT387RUxs P3YLECKQ2ocgIjlBRbsW5AjqDaP5rHUs9PTYZpkpiKgvbyQDTBRA1JI51SHhQe0= X-Google-Smtp-Source: AGHT+IEULKh7FQV54+q/xeZbyOARAdIF+hDQfhTXl+AZITegACfGD2sxABPOa1U4c/pe136+/HRILw== X-Received: by 2002:a17:906:f0d1:b0:a3d:1771:26c6 with SMTP id dk17-20020a170906f0d100b00a3d177126c6mr247852ejb.2.1707852595112; Tue, 13 Feb 2024 11:29:55 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUT2KGqEAiReydhQKPn7i3L2jYYIbhxXpFzSXcyQjPEXZ6cIr/2JanQbJ7CzBt5izDZjI6mTvrslzy0ML0Hvxi28PwLJGpTVjss9sCjv6m6TFZVeMMdb7vs+vDYG+Ls Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id sd18-20020a170906ce3200b00a3c456b0c0esm1573041ejb.108.2024.02.13.11.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 11:29:54 -0800 (PST) Message-ID: <3604eaa2d70ad07a9c80c5166f42fad536b63a77.1707852049.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Tue, 13 Feb 2024 19:30:50 +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)