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: 60968 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 8C8B927BBE9; Sat, 24 Feb 2024 08:41:24 +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 79A5127BBE2 for ; Sat, 24 Feb 2024 08:41:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnaN-0007UJ-Tv; Sat, 24 Feb 2024 03:40:43 -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 1rdnaM-0007T8-Ih for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:42 -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 1rdnaM-0000cg-Ae for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnah-0001go-Ul; Sat, 24 Feb 2024 03:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH emacs-team v11 5/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: Sat, 24 Feb 2024 08:41: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: Suhail , 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.17087640276286 (code B ref 67260); Sat, 24 Feb 2024 08:41:03 +0000 Received: (at 67260) by debbugs.gnu.org; 24 Feb 2024 08:40:27 +0000 Received: from localhost ([127.0.0.1]:39043 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdna6-0001dF-Qb for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:27 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:54620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdna3-0001cc-3e for 67260@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:24 -0500 Received: by mail-wr1-f68.google.com with SMTP id ffacd0b85a97d-33d066f8239so965667f8f.1 for <67260@debbugs.gnu.org>; Sat, 24 Feb 2024 00:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708763933; x=1709368733; 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=fMETDSxXib6b8CWP+OKAjjoAOBDLmIJhOwH2PlLCWD/IRTkmJksJuklJkChdE/VEK6 jtzzR6s/6YaLr7o+ZWawiiIgQHu0z3QqpcAXyY543VpGlUMKOAouYXvUPGZo2N1kszV2 +ltF2lmwwAl6QKjR7JTNzecwTVlwu+LrGxzG0auVTH2iHZPav+/ESzpv67dDFDK6BOqb kpt7LzHviv4L3LZmJ9DFEZOgXtH9MIVm8LF9EMogHGHtcYngNuvnLWBYioyuQUc/RcMU MeaVSzL+CigTj6tJ+LZb35yISPE1OOD7U+FgOBMd/V+5pQJRr46qbvG78hdrwZrjHrUy R+Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708763933; x=1709368733; 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=ccJLr7co0+ilhDtASovu1iFDy2FgTfoDl1sj3hMu582biMofHkt3MOxk+qIg0KT0uq 84aPCNhyTUEHMw/3Ru0vY9L2zURkRZjguI0myfgJv2yAi+BRdZuGmEm48kByBo1IcKqG 3AAwcf9rdDb2WEF/ChFgEp7c2RVd0vrsZhqvCbepcHHW9v8jhIfog4L8rxMuDSG1Y3w6 Fb0/aJjJIVhvWkjfQpANaLm9u0OAwa3/oZdLazwev5UxSHo9jyWjug9oN8rWFYm3WNdK x9ZpDTmTfU3DT0zmtBOetyJEV7I1nvo2QddoE9TAWgTuBDUqzyzj2pThfQ2Vu6NMrN4N fGBA== X-Gm-Message-State: AOJu0YyfsKhi8tKta+ut23Zfsdsf+VABt3iHBSFhT4ElL3ihs6TXD6m/ CBz7GArPWPvF4drDboOS1aCQeHbFPq/U4X3gAOSCBsoxfGhWZ4ZpSolPFjnEZXA= X-Google-Smtp-Source: AGHT+IHYf1kPfPFX5Zwv1oSCgY7c9JIJ3B4QVSWshVaXrFw3XNH0HGJX5aNGQbRNDi/0XOFa3UxJmA== X-Received: by 2002:aa7:c899:0:b0:565:9c99:8089 with SMTP id p25-20020aa7c899000000b005659c998089mr693385eds.38.1708762439364; Sat, 24 Feb 2024 00:13:59 -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 fk2-20020a056402398200b00565aed6c2a8sm160945edb.29.2024.02.24.00.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 00:13:59 -0800 (PST) Message-ID: <56a7c1308a1f1601299b8c7706fb4d00d5c185d0.1708761863.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)