From patchwork Fri Feb 23 18:18:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 60934 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 A90B027BBE9; Fri, 23 Feb 2024 18:38:26 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 4DCAE27BBE2 for ; Fri, 23 Feb 2024 18:38:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdaQt-0000I0-Mb; Fri, 23 Feb 2024 13:38:03 -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 1rdaEt-00016O-Qi for guix-patches@gnu.org; Fri, 23 Feb 2024 13:25: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 1rdaEt-0002pa-Ht for guix-patches@gnu.org; Fri, 23 Feb 2024 13:25:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdaFH-0004Ct-4a for guix-patches@gnu.org; Fri, 23 Feb 2024 13:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69337] [PATCH 1/2] build-system/guile: Fix indentation. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Feb 2024 18:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69337@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 69337-submit@debbugs.gnu.org id=B69337.170871272016022 (code B ref 69337); Fri, 23 Feb 2024 18:26:03 +0000 Received: (at 69337) by debbugs.gnu.org; 23 Feb 2024 18:25:20 +0000 Received: from localhost ([127.0.0.1]:60125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdaEa-0004AE-D7 for submit@debbugs.gnu.org; Fri, 23 Feb 2024 13:25:20 -0500 Received: from wolfsden.cz ([37.205.8.62]:59216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rda8H-0003qf-Mw for 69337@debbugs.gnu.org; Fri, 23 Feb 2024 13:18:50 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 51C6F25792B; Fri, 23 Feb 2024 18:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1708712304; bh=tEF/ed2gMuUFtLq+253kaR20wSPJb5Rti4vIOj01nI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Tuv++cV84d+SoMGTLKnY+iuZTT9IBkDadn3td2vMfAorG6L0/05ysZxPq0mZPtcwd lW6yFMGzmI3VvNWrgziY8zx3pAchph8NQlWT7b+tJioafDoD2fHgjOJIMnG27OXYzs pjHc9o6FjVi8PtfPMkr4fs1OeSIhYZe6XEpQhcjePtDMWCvFTD/+V2EirGb96MIMFB qNo9cSYZ+HESdGS2rxnatcGfqPBMk8F+oiCIIyh+AHt+PyqGJbQ1qr8hyPIAsG2V/v +oZXvHa3r8lENnIt+Tq2vEdwIatST/23RZ0SeEiXBlXX/z70JSu3Y7/eKOA0rDrco6 8GgH7dq0qGpS740eGwIFmNKMvflya7TKQxks8d9n2qTxKC3LT8PHzqSRxusZnb/iOp M2/9R3U13x09Rra3Cw8mGmf/hZ5O0m+v08xc7xPlYQ3t4wL+05WNklWVXOZmvG2y4E 2BTMOepMvUHnE/bIn8SJjAV6oEOuysW/4x7JxUsbSPGfdPoJG/44JsQbZ1pLxxa2wb zD8LzkL9+/hkCYROS1k2fK25NGkkgssdeAouWjz5Gu6FC5tbQVjOgAK9xqqs52pUEp eIfwF+c9YtD1ByA+GJV0bU+/eKIjfoZGh3th7lTQyU3MZIWJSI8bTnTtbBJ6aijPz8 aZtjJpkihGJ9nzC7PGoSBpU4= Received: from localhost (unknown [193.32.127.159]) by wolfsden.cz (Postfix) with ESMTPSA id 0619F2573B1; Fri, 23 Feb 2024 18:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1708712304; bh=tEF/ed2gMuUFtLq+253kaR20wSPJb5Rti4vIOj01nI4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Tuv++cV84d+SoMGTLKnY+iuZTT9IBkDadn3td2vMfAorG6L0/05ysZxPq0mZPtcwd lW6yFMGzmI3VvNWrgziY8zx3pAchph8NQlWT7b+tJioafDoD2fHgjOJIMnG27OXYzs pjHc9o6FjVi8PtfPMkr4fs1OeSIhYZe6XEpQhcjePtDMWCvFTD/+V2EirGb96MIMFB qNo9cSYZ+HESdGS2rxnatcGfqPBMk8F+oiCIIyh+AHt+PyqGJbQ1qr8hyPIAsG2V/v +oZXvHa3r8lENnIt+Tq2vEdwIatST/23RZ0SeEiXBlXX/z70JSu3Y7/eKOA0rDrco6 8GgH7dq0qGpS740eGwIFmNKMvflya7TKQxks8d9n2qTxKC3LT8PHzqSRxusZnb/iOp M2/9R3U13x09Rra3Cw8mGmf/hZ5O0m+v08xc7xPlYQ3t4wL+05WNklWVXOZmvG2y4E 2BTMOepMvUHnE/bIn8SJjAV6oEOuysW/4x7JxUsbSPGfdPoJG/44JsQbZ1pLxxa2wb zD8LzkL9+/hkCYROS1k2fK25NGkkgssdeAouWjz5Gu6FC5tbQVjOgAK9xqqs52pUEp eIfwF+c9YtD1ByA+GJV0bU+/eKIjfoZGh3th7lTQyU3MZIWJSI8bTnTtbBJ6aijPz8 aZtjJpkihGJ9nzC7PGoSBpU4= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 23 Feb 2024 19:18:13 +0100 Message-ID: <316aa06d566021f1082ba7b6d10b265673c3079a.1708709549.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 The inner (let) was on the same level as the outer one, which was confusing. * guix/build/guile-build-system.scm (build): Fix indentation. Change-Id: I701b61747c270b185eac9377b066748baa2b3d20 --- guix/build/guile-build-system.scm | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm index e7e7f2d0be..90a9ee182b 100644 --- a/guix/build/guile-build-system.scm +++ b/guix/build/guile-build-system.scm @@ -184,32 +184,32 @@ (define* (build #:key outputs inputs native-inputs (#f "") (path (string-append ":" path))))) - (let ((source-files + (let ((source-files (with-directory-excursion source-directory (find-files "." scheme-file-regexp)))) - (invoke-each - (filter-map (lambda (file) - (and (or (not not-compiled-file-regexp) - (not (string-match not-compiled-file-regexp - file))) - (cons* guild - "guild" "compile" - "-L" source-directory - "-o" (string-append go-dir - (file-sans-extension file) - ".go") - (string-append source-directory "/" file) - flags))) - source-files) - #:max-processes (parallel-job-count) - #:report-progress report-build-progress) + (invoke-each + (filter-map (lambda (file) + (and (or (not not-compiled-file-regexp) + (not (string-match not-compiled-file-regexp + file))) + (cons* guild + "guild" "compile" + "-L" source-directory + "-o" (string-append go-dir + (file-sans-extension file) + ".go") + (string-append source-directory "/" file) + flags))) + source-files) + #:max-processes (parallel-job-count) + #:report-progress report-build-progress) - (for-each - (lambda (file) + (for-each + (lambda (file) (install-file (string-append source-directory "/" file) (string-append module-dir "/" (dirname file)))) - source-files)) + source-files)) #t)) (define* (install-documentation #:key outputs From patchwork Fri Feb 23 18:18:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 60937 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 3832F27BBEA; Fri, 23 Feb 2024 18:58:38 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 8D10527BBE2 for ; Fri, 23 Feb 2024 18:58:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdaka-00026u-SE; Fri, 23 Feb 2024 13:58:25 -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 1rdaDv-0000OS-T3 for guix-patches@gnu.org; Fri, 23 Feb 2024 13:24:39 -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 1rdaDv-0002aD-2Q for guix-patches@gnu.org; Fri, 23 Feb 2024 13:24:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdaEI-000494-BR for guix-patches@gnu.org; Fri, 23 Feb 2024 13:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69337] [PATCH 2/2] build-system/guile: Install .scm files first. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Feb 2024 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69337@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 69337-submit@debbugs.gnu.org id=B69337.170871268115869 (code B ref 69337); Fri, 23 Feb 2024 18:25:02 +0000 Received: (at 69337) by debbugs.gnu.org; 23 Feb 2024 18:24:41 +0000 Received: from localhost ([127.0.0.1]:60067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdaDx-00047t-Ci for submit@debbugs.gnu.org; Fri, 23 Feb 2024 13:24:41 -0500 Received: from wolfsden.cz ([37.205.8.62]:38764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rdaDv-00047b-1h for 69337@debbugs.gnu.org; Fri, 23 Feb 2024 13:24:40 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 31AAC2567E9; Fri, 23 Feb 2024 18:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1708712305; bh=iHLYDWxV77klRsX0lu6K8AvSW44elEkhSf4EbvxO7lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oigb/v0ERUb1eyZkTaR43Z9FxttarzcnzSz/w8GwIFOfTBy6gRPa/8QxHBnq4S5WP wNnC1KueI45G8bwiPFeNH4Ywwq03ooeaC9f4FOOd+QUkc/C1dkRRMiPKbCS5d98AnP vZ9V6XjpbmiMfz6gBTj57HxfieUSch+DWSpDHpNb/r0XoH8W4u4iBlZc0y3rljx3hn 39bEWKtz5Zs/W8D7N+F8LUxmomIbuGS79GBBDxzj7Iza+wtfVzvG0tDp9x/Oid+QNe TvhjJRDKGyShPbqOeF+J76ZBHw0BGImz3XmBy1pLlG0HDCGsSsnPpvxGZPvU1ik7Ia QSWieCbr7fGGyhn+PEzo3G796jTR7jiEu77N8FIvFl+BAKiccu5azjUrDtc4sbZb98 o88cRVoaBUaUdS0l7z3OGWchtdmcHcYphvrR/T5hlrJ9D8PBBFP+ppm7UIAs0JV4C/ ohsALAXlidzxJ+rfELEVVHTTb/CkXuif4Xi39EhQDgLmsYCOxT0fvZi42bIB9tTvPo zPlmJS+33/6sLMmqbOyp/xndQ2cST2Wv1rz0KFkzlqQ3g75J0dQcQizFj+NecU5Leb 6EzcYwJ3ONgQUrdE+8dj88NeAY9Ir5UM4fGnTlBGxW04WsV7j5xhQ1rZEPqTktqSP6 +6WlMZQRTr4eq2GOQzeoVLOw= Received: from localhost (unknown [193.32.127.159]) by wolfsden.cz (Postfix) with ESMTPSA id CEA82256E24; Fri, 23 Feb 2024 18:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1708712304; bh=iHLYDWxV77klRsX0lu6K8AvSW44elEkhSf4EbvxO7lo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cns4HHdR2raJQRFKYY2YOJzKxAPXND1+UUvsfpwByX14ZbQP3wM2VDsdJ5WVjrH5E UNCMPr3Ldo/CMrOIAYoIHsWF6cO8Lc+aXF/2JYOMFSO7NpU3xznOTZHdlFd9767biR j4XD7jdpV8Q138O6UznzNe+x5qsXAIGPDtPVO9SLBvktY3t4UnA9spS6xNaShYoxmp wvhoGUoiQtQamWA/ChHHJ718M0Xu4cDApMF9Mr+MHk+8SSc+LnoeAt1Lpl5vNdO7tB VSTjcbMT3AwopquRnvSKGVsvvm0tUV/qNR88tf5gGeiunAHXcgMk9lBP6WNgDj0ka/ Ldnu3GGn/ed0Pma/FJCSCfC2CxgmzFW8lNQt4brkynJQUpBAMWVTvKqqPj1oQyRRaW FZBMMFn+HVV2i1vpmfQPZXQzVzv/iJOrKiopHCYRsxCe79AHYskWez3UaWnqKdo8YM O7D79vife+7MiQAyEYdhOT0lLeR7/aDkmNWR/n+e7UG3yQ8Tl3crnpp+/eUIydL0ne U297u7hS+1OTUmCf7ipo2wvrSgvU7eAez88/ZWK0py0id1qZ9BqZiB8dxeXjDAb8zG 3z+QtRCsqym9tUn4oSaHKaYJCTc3oUteZuETgVjqWf5/QX/nMHM5IH72yoVyaxTjXd ezZx/bbKtCziJv/1OdD2CGV0= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 23 Feb 2024 19:18:14 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Until now the .go files were generated first, and only after that the .scm files were installed into the target location. That led to a lot of messages about `source file ... newer than compiled' if the custom 'check phase tried to load the compiled files. Swapping the order of the actions resolves the issue allowing the tests to be written without lot of noise in the build log. For final artifacts it was not a problem, since daemon resets the timestamps. * guix/build/guile-build-system.scm (build): Install .scm before producing .go. Change-Id: I3428d144fcbaa6c904ee662193c3bca82589e344 --- guix/build/guile-build-system.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm index 90a9ee182b..ceda4c1f4c 100644 --- a/guix/build/guile-build-system.scm +++ b/guix/build/guile-build-system.scm @@ -187,6 +187,12 @@ (define* (build #:key outputs inputs native-inputs (let ((source-files (with-directory-excursion source-directory (find-files "." scheme-file-regexp)))) + (for-each + (lambda (file) + (install-file (string-append source-directory "/" file) + (string-append module-dir + "/" (dirname file)))) + source-files) (invoke-each (filter-map (lambda (file) (and (or (not not-compiled-file-regexp) @@ -202,14 +208,7 @@ (define* (build #:key outputs inputs native-inputs flags))) source-files) #:max-processes (parallel-job-count) - #:report-progress report-build-progress) - - (for-each - (lambda (file) - (install-file (string-append source-directory "/" file) - (string-append module-dir - "/" (dirname file)))) - source-files)) + #:report-progress report-build-progress)) #t)) (define* (install-documentation #:key outputs