From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OONfIPmt8mIdMAAAbAwnHQ (envelope-from ) for ; Tue, 09 Aug 2022 20:56:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OFRiIPmt8mIPQQAA9RJhRA (envelope-from ) for ; Tue, 09 Aug 2022 20:56:57 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5C9D12031F for ; Tue, 9 Aug 2022 20:56:57 +0200 (CEST) Received: from localhost ([::1]:57586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUPQ-0006Oi-9R for larch@yhetil.org; Tue, 09 Aug 2022 14:56:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKi-0000pM-Eq for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55268) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKi-00025z-3l for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKi-0003UB-0F for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 6/6] build-system: emacs: Use native compilation. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111213342 (code B ref 57086); Tue, 09 Aug 2022 18:52:03 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:52 +0000 Received: from localhost ([127.0.0.1]:45011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKW-0003T3-5h for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:52 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:43956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKR-0003S3-Kn for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:49 -0400 Received: by mail-ej1-f67.google.com with SMTP id gb36so23751650ejc.10 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=FsrC9X6VVEpUNisCT3rinGquv2+cOAKy8KJBhOon+m8=; b=IY984cZoXzfF0uhT5ysorRgEJ3+OeOl7JPG5qpgk1cB1Millq2xQb0kd2eQKQhDFCM QGRjwGNBttak5eh3VJ6jVz/+7mKD48nxSxaY6OmD4QugtRuDOzK5Kjp/9eVOcCxg5KSm HhFK0LGJU+L8DxUUZtPK/goMere8YUP3bAXvYj6UgM0E0CAov9rNLxjFLAnZrJUnHGrU 8R67nNRxeAydeA7BMGKPSB0WpMwbS5FODliuNzQiWwRIPnT/Q7q9oduBjEbX4WwvOFXn jcwFNNGh+dzGt0UST6XrjMJ19bb9GUgBRW6QzD+s0TPlhvc8aEgcEcnyfr8REKgeQ+wz wydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=FsrC9X6VVEpUNisCT3rinGquv2+cOAKy8KJBhOon+m8=; b=h7NCnLVCgssWOtIEP4VSCeP4Eqbg07IZd2iDE72dBJGqmy9xCXJ9zWrzmoFttZV4Iw +C7ylw1g5vHBvlzYR8eUMLofjVuJEBfbXLmaqtNqGAofpM7P3oKCchbbwdmczf5KPkUa 7xnvoJamQdJLsaAUb7zlzqIwavptL7NT84ukotPtAaxSgczLzvqh2eVAfCIQead8jpOn 4kuJx5aC3zYdUhykaaNLgZwrsM0cCPeSF9p8ivJLOv+MLSjiUfHixV6uHaWBAB8U6O4L JSTkn6kMRJpIUG5WVlNOb43Ov2XtyJvGDWJ5LIBPWpytx6+waTMKCW2AJdj/V9v6Jkzd EPMg== X-Gm-Message-State: ACgBeo0w+bXF44Qmiyti0PZLerU9XyOlchkP0fBtWpL+1JJuMX9IqJDl 5gGXDctxkQsmYke/Bstg0A2iJt5Uuxc= X-Google-Smtp-Source: AA6agR7h6MOvGYpYCcOCRURTXIBrNtH+rcym/wA+wH9ux5NHyearoG63lTQBpR1jwUjp7D/XcHBEig== X-Received: by 2002:a17:906:84e1:b0:732:1ea0:8b43 with SMTP id zp1-20020a17090684e100b007321ea08b43mr3562502ejb.343.1660071102048; Tue, 09 Aug 2022 11:51:42 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.41 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:41 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 9 Aug 2022 20:32:37 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <76e36854b8ede1216159b68eb1b651f759d75943.camel@gmail.com> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660071417; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FsrC9X6VVEpUNisCT3rinGquv2+cOAKy8KJBhOon+m8=; b=K4LcgUdxTyvcueTGs1gC0gbVn/lX0hYVoYWNRWsr0vymRZa9/ENwZF5u+/Q9RIasa/NXG2 RTYDm/iA0GlLavCSsCl/W94Xs1Tqmh1mDv+pHjxMIPJ3Rc3gxLhjGRWDnIMATppx4bU0KF 5jhwP4qQllMFZ4ulmjjarsL7Ym07/d3Fgls+ep/qyYWoI37zIe+bwSm3i4sIOHIFyQUgQg GcmrBFmtp29FPQ2eM9T299TEKEiGNPLnbYOfSU0fTH+vMRV2GCzRvvF1Ln1+UMDzGf5Z1m pYNurB1D13HBYzM+iF6NzdUoAFd3u2JEQEZtn5H1RIOXpE2TCsZhTIUuJibGeA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660071417; a=rsa-sha256; cv=none; b=aDqxDxmzytjxHLgQW5LmtoM92NOt5r6xWmJnSSqMRhwSm24Bogcws8u2aJ1ADLVKn+sRXC BGcOATQlmxJTbqnxIOcGevjnYeuomQE8rDJhs37sGtMoIr3XbO/2Xs/daXLOnrLIMGf1Fc z8nnKctomBqH87ekl6oqwkLUScDH0uzlW0JZH5q31XOurvTLjXjcHfY+v5S/ZQySmEmGeO 7AXZ8vjbacEe3jkdOQh84T02vOvIfs0CCnrbhWP0s1VP4tlzCmVisx0/Tqmu5C7Nrcldp0 alHmpQ2VJ0cYg6kgTkIibgjj4eZj3cJWaiZkz0TFaN5Vb3V89LsjGvAElq4U2g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IY984cZo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.51 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=IY984cZo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 5C9D12031F X-Spam-Score: 4.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: zf52/3XHy5Zh * guix/build/emacs-build-system.scm (build): Use ‘emacs-compile-directory’ rather than ‘emacs-byte-compile-directory’. Also delete already compiled files in the working directory prior to compilation. --- guix/build/emacs-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 6a6918bfdd..9ecfceccf1 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -110,11 +110,14 @@ (define* (expand-load-path #:key (prepend-source? #t) #:allow-other-keys) (define* (build #:key outputs inputs #:allow-other-keys) "Compile .el files." + ;; Ensure that already compiled files in the working directory don't shadow + ;; the build. Might happen, because check runs first. + (for-each delete-file (find-files "." "\\.el[cn]$")) (let* ((emacs (search-input-file inputs "/bin/emacs")) (out (assoc-ref outputs "out"))) (setenv "SHELL" "sh") (parameterize ((%emacs emacs)) - (emacs-byte-compile-directory (elpa-directory out))))) + (emacs-compile-directory (elpa-directory out))))) (define* (patch-el-files #:key outputs #:allow-other-keys) "Substitute the absolute \"/bin/\" directory with the right location in the -- 2.37.0