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: 59491 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 B082927BBEA; Sat, 27 Jan 2024 20:59:46 +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 6304F27BBE2 for ; Sat, 27 Jan 2024 20:59:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTplQ-0004sn-IF; Sat, 27 Jan 2024 15:58:56 -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 1rTplP-0004sH-Db for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -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 1rTplP-0005qF-5m for guix-patches@gnu.org; Sat, 27 Jan 2024 15:58:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTplW-000568-Cq for guix-patches@gnu.org; Sat, 27 Jan 2024 15:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v8 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 20:59: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, Suhail , andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170638911119517 (code B ref 67260); Sat, 27 Jan 2024 20:59:02 +0000 Received: (at 67260) by debbugs.gnu.org; 27 Jan 2024 20:58:31 +0000 Received: from localhost ([127.0.0.1]:56038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpl0-00054i-O6 for submit@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:31 -0500 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:59578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTpko-00053Y-N2 for 67260@debbugs.gnu.org; Sat, 27 Jan 2024 15:58:19 -0500 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a33735d22fcso92473666b.2 for <67260@debbugs.gnu.org>; Sat, 27 Jan 2024 12:58:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706389086; x=1706993886; 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=K0bUKGc+W27nLKazJE9wfpZIjodQX+HWsYID+X04zIwMKnlsMfrscrozSIeqnqSKNS +KvVuVB6mllBoTUa7g46uIDRMIY76QLxtlwwDwQ6z5rSdt1t5LN+wN4nD75u5o49xky8 BsO1EvCj/eCAzUfcbsJjbIAQAuOtxYB8l5kEItqY1wNsqE9tkFE4YzyGclx5hRXM31x4 KGgDprnYNtOpNqvX5DgnOEVTdYEJkBMn65CJsltKedSb1yh4jtinvytPJddfN9YxcGqf hZEi1YecVxc4wcY8pbI5XeKH5vXKiO2rFrb6/yzuMQBOM2sInR3vmOW66h/2tJcgUQc3 TkPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706389086; x=1706993886; 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=Suw7jX+AFuTUV9tqTXSKpXmQvr+sFSoWPSM/tigKipImlFiuH1zrNoZFvQVGzmut2j UhdU5TuJcTwkS+rLmhJmr5mOko0XD9EWbOYYjOhLlxdiAi9UdslsYwmg2k8+yxy768Hv BeAxPu75YT3h88iMvIacgBeCIK0ra0e+twhPJI1oZ61e0JURrGjifFWRmO7grtbNUCib RkqmGetODsiTTa+X/XMIG5kgOPWsi/Vn4WPBEDdzLdWbhkD/cr4DWx8YdeNVoKp3n+ld cu1WyFuP9oCvnqZC+YHb1is4BLVsRuh4aSd6N3rmhvJed4EBIS51t1EIWBZiWtY+8kD5 d/XA== X-Gm-Message-State: AOJu0Yw3M/kSi2FpCfDgBSlgelOt3C6GBxhGrzwDMGHfhE5zsO9SSeCJ q16NMRlArICMIHLjmrrk35aNzLD7SLKMfnkAtqVdZgP4zXeY9ZM+eIj8wxDWYqA= X-Google-Smtp-Source: AGHT+IE2gHBkKjidK3P1/tAoocRskFHlAo1T24EaFHq/X9UGpZextdbyP3XxsrVKA8M3kQo7Ne/IKQ== X-Received: by 2002:a17:906:34d7:b0:a31:6c5e:eb96 with SMTP id h23-20020a17090634d700b00a316c5eeb96mr1432982ejb.58.1706389085811; Sat, 27 Jan 2024 12:58:05 -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 q14-20020a17090622ce00b00a33dbebfd3fsm2081051eja.209.2024.01.27.12.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jan 2024 12:58:05 -0800 (PST) Message-ID: <45656b35960c59a586547bca0b9c80491a77a027.1706389058.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)