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: 59452 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 E5BF027BBEA; Sat, 27 Jan 2024 07:05:09 +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 76A8D27BBE2 for ; Sat, 27 Jan 2024 07:05:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTckM-00025f-K7; Sat, 27 Jan 2024 02:04:58 -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 1rTckL-00024b-5r for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04: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 1rTckK-000500-UD for guix-patches@gnu.org; Sat, 27 Jan 2024 02:04:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTckR-0002Yg-Qi for guix-patches@gnu.org; Sat, 27 Jan 2024 02:05: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: Sat, 27 Jan 2024 07:05: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.17063390719746 (code B ref 67260); Sat, 27 Jan 2024 07:05:03 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 07:04:31 +0000 Received: from localhost ([127.0.0.1]:53339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjv-0002X2-Dz for submit@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:31 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:46357) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTcjl-0002Vl-CI for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 02:04:22 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-a3536102785so25697466b.1 for <67260@debbugs.gnu.org>; Fri, 26 Jan 2024 23:04:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706339049; x=1706943849; 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=k45B4uBi36tCwsquiZvPWeYUFX805MzT7rpjsJSwNl6VynmltenLgSfeey9YFtNCA/ JSUawGMRGUzXc/+tdaz9DK26Bcu6ATqM3wws+IzspDmtBLpm1tNZc4pl8ncsVF/Fmcyl 93R0GQMYrK8IGoF2eIzuJ/AcPv2sCW1aXCOv40iY1684YntZCxW9fmxLdyf+SE2/SeBI lcYVgB8p5flbW8NW51tbBolRBZUdHxW8YTeq+6NoiQvHobcz1Xwu7+QUSWLJrl/TR3+a pAHBUtMXSviRGEuERcpt+HvUbeI9zfbAjiJhUOhhbXaKuhSjEbflie5/o1x6Sm5cjqiR XLuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706339049; x=1706943849; 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=E+QpR0BkDez6g9cYiL1SUSFcZ30C+ca1hatSglw+EU9NI4ZtFKZpiUNP5FIB2mDJAf 0uixNoeb4uezMjwLupuCNbRZYmbf41o7QV3am6E6lZY9dkEuXSFP/0mXhcBAAPXj/mS/ LRnVRagsKnxyh20utP9javHQzjW8e9u2RH8L9dZ4/OepkzOn1j6s6nxz0t9UASl9snNy x8ixhhRQXgm+4W+CX74s3V8Iq8H2yS3+NyHvULm7o8nmavDLfv3d5UFR8JbsWOuz0/Dx Q1tuHQTPlEaO6gGID/1rJovSB9xWGeXM2yXnkG5249yfDt2rbHOtC4zC1q8xJYt5cCtY xt6Q== X-Gm-Message-State: AOJu0YzXz3DV6nzK/DvK2NQoMBJDo77GbivLRm2/m9G8YIh8wJIza4VU 4PaUoF+u7LfL3o2FtNoigIOuNrzS87M2Z8g5p0bXEWrGqy5RyaZSq2IcBBtB094= X-Google-Smtp-Source: AGHT+IHocwoV4F+qnJpcfeTmdCMhaeGoFofNgcefM0flGEhUPh/IjImedWg1SH3dnGbJb+xbObJ1YA== X-Received: by 2002:a17:906:4ada:b0:a35:50c5:2038 with SMTP id u26-20020a1709064ada00b00a3550c52038mr115212ejt.6.1706339048671; Fri, 26 Jan 2024 23:04: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 tx18-20020a1709078e9200b00a3551f727d1sm92626ejc.68.2024.01.26.23.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jan 2024 23:04:08 -0800 (PST) Message-ID: <174b0112dccebee22b08fc6931980766c0653c1f.1706339016.git.liliana.prikler@gmail.com> 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)