From patchwork Sat Nov 25 11:13:53 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: 56819 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 71A3B27BBE9; Sat, 25 Nov 2023 11:16:17 +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 3088E27BBE2 for ; Sat, 25 Nov 2023 11:16:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6qdj-00028I-GT; Sat, 25 Nov 2023 06:16:00 -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 1r6qdh-00025c-F3 for guix-patches@gnu.org; Sat, 25 Nov 2023 06:15: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 1r6qdh-0000yb-4g for guix-patches@gnu.org; Sat, 25 Nov 2023 06:15:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r6qdm-00019F-4S for guix-patches@gnu.org; Sat, 25 Nov 2023 06:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v3 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 11:16: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: cox.katherine.e+guix@gmail.com, andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170091090627555 (code B ref 67260); Sat, 25 Nov 2023 11:16:02 +0000 Received: (at 67260) by debbugs.gnu.org; 25 Nov 2023 11:15:06 +0000 Received: from localhost ([127.0.0.1]:37995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcr-00079d-MG for submit@debbugs.gnu.org; Sat, 25 Nov 2023 06:15:05 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:60647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r6qcm-0006yO-FZ for 67260@debbugs.gnu.org; Sat, 25 Nov 2023 06:15:00 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54b0f2c50eeso1032204a12.0 for <67260@debbugs.gnu.org>; Sat, 25 Nov 2023 03:14:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700910889; x=1701515689; 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=JmlDKbp3P1Q9z1XZn4Xf7v3f7dULrHb7cUSRpbSd4AgOMpSLBBhrqSivzJsD7hTKlA JwIsuQrV6XGxRTnhS3qXYLI8HKgf3Wp5Uc72Ql3blNV+jGumMen53YiVAtiICl66+xEN uKw3z8y2XHBIvKs1sPp1TeDsTISzedFQiZ7SW2lOVC7lAuywrxOZCzSZkOy7RnLWGu5h z2/uS/qtjAS9yrqqQYccPCqQtxsQ+K8H4xQV+CfevJu8882Njfhz7y6CxntQtk1kHmu6 h6ASIg4FFPoQo1VYN8dZZQ91N/+4J4CYD20h0FWTWJ9sLpOHNrB7w+F+P4Ff7ZXpaW4c 0ANw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700910889; x=1701515689; 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=fUd9KqA2zaqpgyBuxqagZRw3wvKoD+/0xUw6w62w6LQkQZsKGZp51FJ3LGUkd7ITXi ZnfMcbJMaTM1rP9e3rH44xNNyLhigPcEpSoQx8paE4ibL7IqzNgIiDeyBpOMVNup4W/D oD6wdKMsnglEwUo50Du8QRonXNYvxXf8/CN7m+OIonISeh6MS+3pIAsy48ltGLi5b41A CEOr4WrjZRYNJGJ+0A2rWcEB1Dm3ZZFu2gsVfnLwme8i5t8GAephijSSh/HG5i1UtNGt sF22rRkUtx80jiqWwW0hADuVLdQr54S77CFoACjo4C02qvVHxpyg7s5zEFyl2JXkgiLe gZdQ== X-Gm-Message-State: AOJu0Yxrps8XFan4CQqwRtUPJsQZLs3lCdd0f8P/y8N0AuT6VFCX4ROf kQzLcc6POR5jASQE1Rg6dgRVoSwaIZmxlA== X-Google-Smtp-Source: AGHT+IH9pRRHCggTu1Utck8td+yXdrJ2bhUUlYNM5bZ9tnoov/Cu4sxz/yFx5MmifwToXOKl+NxVUQ== X-Received: by 2002:a17:906:a1c3:b0:9d2:9dbe:a2f9 with SMTP id bx3-20020a170906a1c300b009d29dbea2f9mr4396445ejb.50.1700910889489; Sat, 25 Nov 2023 03:14:49 -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 z2-20020a170906434200b009ad7fc17b2asm3287246ejm.224.2023.11.25.03.14.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Nov 2023 03:14:47 -0800 (PST) Message-ID: <2460e8aa5efadac8e330bce567a1a2547c2393e7.1700910860.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1700910860.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 12:13:53 +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)