X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 0/5] build-system improvements
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 24 Apr 2025 22:46:02 +0000
Resent-Message-ID: <handler.78050.B.174553473324758 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.174553473324758
(code B ref -1); Thu, 24 Apr 2025 22:46:02 +0000
Received: (at submit) by debbugs.gnu.org; 24 Apr 2025 22:45:33 +0000
Received: from localhost ([127.0.0.1]:42576 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u85K0-0006RG-Mt
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 18:45:32 -0400
Received: from lists.gnu.org ([2001:470:142::17]:35440)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u85Jv-0006Qw-K4
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 18:45:30 -0400
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 <ngraves@HIDDEN>)
id 1u85Jo-0000cL-Bn
for guix-patches@HIDDEN; Thu, 24 Apr 2025 18:45:20 -0400
Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
id 1u85Jl-0003dX-9t
for guix-patches@HIDDEN; Thu, 24 Apr 2025 18:45:20 -0400
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net [152.228.215.222])
by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4Zk9zF1F95z1YbN;
Thu, 24 Apr 2025 22:45:12 +0000 (UTC)
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net. [127.0.0.1])
by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <guix-patches@HIDDEN>; Thu, 24 Apr 2025 22:45:12 +0000 (UTC)
Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.225])
by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id
4Zk9zD4Wtmz7wVj; Thu, 24 Apr 2025 22:45:12 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.5])
by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 335A9D43E24;
Thu, 24 Apr 2025 22:45:12 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-106R0067f699802-d11d-47d6-9f35-d53ee1a04d00,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 00:42:10 +0200
Message-ID: <20250424224510.6178-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 13760748665046491874
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtieelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=KPeUD5eTAmsFkcAU/pNaPR7zOnZdmDK0x+Jgs6GzpUk=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745534713; v=1;
b=VUAD/e5nZaIv65KCf68LJ7+4OLnZgEVuXpnfYMPgw5FMx9xipQbYXoBKXPxLXsWxAEdkoa6f
xvh3MV6u01DOKYP82ZlFrac22bvSBS5+llhliI2lxwgKwyiSOzlw1zGXHZM39Qu1HWcHZO2n4Mb
91LYjhv+yKYD5UjhzA3EXN4Pu2JrzyeSdOqmtUv9uGDPhm2UhYWHJSaNanDwKS+fLDTJBE+lwPM
G5WM9MHJsteA9byneZ6mtGRSO6PvbLP76qYfAy9aUDbcSYuF83UhFRgfmirXO6uAT8ki6cnN/Z6
97Yd2fr2LN845RGO/ZZoA5g5Uf9ugb0werHnmiEohFekQ==
Received-SPF: permerror client-ip=46.105.38.146;
envelope-from=ngraves@HIDDEN; helo=4.mo562.mail-out.ovh.net
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001,
T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is an excerpt of 68315's independent build-system improvements. It should not cause any rebuilds, it is for the most part convenience/readibility improvements.
Nicolas Graves (5):
build-system: gnu: Improve gnu-cross-build style.
build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style.
build-system: waf: Improve waf-build style.
build-system: ruby: Improve ruby-cross-build style.
build-system: android-ndk: Improve style.
guix/build-system/android-ndk.scm | 14 ++++-
guix/build-system/glib-or-gtk.scm | 89 ++++++++++++++--------------
guix/build-system/gnu.scm | 96 ++++++++++++++++---------------
guix/build-system/ruby.scm | 37 ++++++------
guix/build-system/waf.scm | 32 ++++++-----
5 files changed, 141 insertions(+), 127 deletions(-)
--
2.49.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Nicolas Graves <ngraves@HIDDEN> Subject: bug#78050: Acknowledgement ([PATCH 0/5] build-system improvements ) Message-ID: <handler.78050.B.174553473324758.ack <at> debbugs.gnu.org> References: <20250424224510.6178-1-ngraves@HIDDEN> X-Gnu-PR-Message: ack 78050 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 78050 <at> debbugs.gnu.org Date: Thu, 24 Apr 2025 22:46:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 78050 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 78050: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78050 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 1/5] build-system: gnu: Improve gnu-cross-build style.
References: <20250424224510.6178-1-ngraves@HIDDEN>
In-Reply-To: <20250424224510.6178-1-ngraves@HIDDEN>
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 25 Apr 2025 00:06:01 +0000
Resent-Message-ID: <handler.78050.B78050.17455395098382 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 78050-submit <at> debbugs.gnu.org id=B78050.17455395098382
(code B ref 78050); Fri, 25 Apr 2025 00:06:01 +0000
Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:09 +0000
Received: from localhost ([127.0.0.1]:42813 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u86Z3-0002Al-5p
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:09 -0400
Received: from 3.mo562.mail-out.ovh.net ([46.105.33.63]:48283)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u86Yy-00028g-GM
for 78050 <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:06 -0400
Received: from director2.derp.mail-out.ovh.net
(director2.derp.mail-out.ovh.net [79.137.60.36])
by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClL44b8z1chT;
Fri, 25 Apr 2025 00:05:02 +0000 (UTC)
Received: from director2.derp.mail-out.ovh.net
(director2.derp.mail-out.ovh.net. [127.0.0.1])
by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <78050 <at> debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:02 +0000 (UTC)
Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.204])
by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id
4ZkClL1gT4zy9k; Fri, 25 Apr 2025 00:05:02 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.0])
by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9FF73BA3F6F;
Fri, 25 Apr 2025 00:05:01 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-108S0026117c821-f502-418f-9250-58c22d854f73,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 02:04:46 +0200
Message-ID: <20250425000456.14363-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15109013800309351138
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetveehffevvdfgtddthedvhfeguefggeffteetueeliedvhffhjeegudehleegheenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=ctux7LzbWnLMRvh/0/Jxq69wr4DQrgAr9Xxcq279MwE=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745539502; v=1;
b=bI32pu8XM95DDGPmTsZAsFtF99x3TPPJtB9S7wxXWbZmytXjQ0OprJ9qL7xDmfnHNqcxxaQB
wu+2beYZGfU6yyrnD6A7r0mCg0rrfIJLLT8PRo5X9MMcXxs/ds47AfKz1MecKyDNbjUoS6e9hYE
UzqCOt+qbGvU1teRK9L5SJVzrhXKjvFOYK6db+2bhnBRL4AAdf+e7fnCmdo+WQfMlgh4GubAlQA
SeNxJmochQlTdr5v5lL3xXk3l/EKxJyjV/ajfr62s3IULXaXxM0UpZiJMVxo39KbHP77DdJOzr2
8dxk1T5hRHGHtyKCRVtM7dKaxL+aaCwfkTuAXoAyq/pyg==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/gnu.scm
(gnu-cross-build): Use with-imported-modules around the
gnu-cross-build builder gexp.
Change-Id: I47246571b1d84a82a67a8c289fd5ad4b5a3b5aeb
---
guix/build-system/gnu.scm | 96 ++++++++++++++++++++-------------------
1 file changed, 49 insertions(+), 47 deletions(-)
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3a314d34b72..a71162c3005 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2024 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -520,59 +521,60 @@ (define* (gnu-cross-build name
cross-built inputs, and NATIVE-INPUTS are inputs that run on the build
platform."
(define builder
- #~(begin
- (use-modules #$@(sexp->gexp modules))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
- (define %build-host-inputs
- #+(input-tuples->gexp build-inputs))
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
- (define %build-target-inputs
- (append #$(input-tuples->gexp host-inputs)
- #+(input-tuples->gexp target-inputs)))
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
- (define %build-inputs
- (append %build-host-inputs %build-target-inputs))
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
- (define %outputs
- #$(outputs->gexp outputs))
+ (define %outputs
+ #$(outputs->gexp outputs))
- (gnu-build #:source #+source
- #:system #$system
- #:build #$build
- #:target #$target
- #:outputs %outputs
- #:inputs %build-target-inputs
- #:native-inputs %build-host-inputs
- #:search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- search-paths))
- #:native-search-paths '#$(sexp->gexp
- (map
- search-path-specification->sexp
- native-search-paths))
- #:phases #$(if (pair? phases)
- (sexp->gexp phases)
- phases)
- #:locale #$locale
- #:separate-from-pid1? #$separate-from-pid1?
- #:bootstrap-scripts #$bootstrap-scripts
- #:configure-flags #$configure-flags
- #:make-flags #$make-flags
- #:out-of-source? #$out-of-source?
- #:tests? #$tests?
- #:test-target #$test-target
- #:parallel-build? #$parallel-build?
- #:parallel-tests? #$parallel-tests?
- #:patch-shebangs? #$patch-shebangs?
- #:license-file-regexp #$license-file-regexp
- #:strip-binaries? #$strip-binaries?
- #:validate-runpath? #$validate-runpath?
- #:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
- #:license-file-regexp #$license-file-regexp
- #:strip-flags #$strip-flags
- #:strip-directories #$strip-directories)))
+ (gnu-build #:source #+source
+ #:system #$system
+ #:build #$build
+ #:target #$target
+ #:outputs %outputs
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ search-paths))
+ #:native-search-paths '#$(sexp->gexp
+ (map
+ search-path-specification->sexp
+ native-search-paths))
+ #:phases #$(if (pair? phases)
+ (sexp->gexp phases)
+ phases)
+ #:locale #$locale
+ #:separate-from-pid1? #$separate-from-pid1?
+ #:bootstrap-scripts #$bootstrap-scripts
+ #:configure-flags #$configure-flags
+ #:make-flags #$make-flags
+ #:out-of-source? #$out-of-source?
+ #:tests? #$tests?
+ #:test-target #$test-target
+ #:parallel-build? #$parallel-build?
+ #:parallel-tests? #$parallel-tests?
+ #:patch-shebangs? #$patch-shebangs?
+ #:license-file-regexp #$license-file-regexp
+ #:strip-binaries? #$strip-binaries?
+ #:validate-runpath? #$validate-runpath?
+ #:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
+ #:license-file-regexp #$license-file-regexp
+ #:strip-flags #$strip-flags
+ #:strip-directories #$strip-directories))))
- (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
+ (mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
(gexp->derivation name builder
#:system system
--
2.49.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 3/5] build-system: waf: Improve waf-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 25 Apr 2025 00:06:02 +0000
Resent-Message-ID: <handler.78050.B78050.17455395128539 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 78050-submit <at> debbugs.gnu.org id=B78050.17455395128539
(code B ref 78050); Fri, 25 Apr 2025 00:06:02 +0000
Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:12 +0000
Received: from localhost ([127.0.0.1]:42818 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u86Z5-0002Db-Pd
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:12 -0400
Received: from 10.mo563.mail-out.ovh.net ([46.105.78.6]:38195)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u86Z1-000291-Md
for 78050 <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:08 -0400
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net [152.228.215.222])
by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClQ13PMz1cwH;
Fri, 25 Apr 2025 00:05:06 +0000 (UTC)
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net. [127.0.0.1])
by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <78050 <at> debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:06 +0000 (UTC)
Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.178.252])
by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id
4ZkClQ03qbz7wVj; Fri, 25 Apr 2025 00:05:06 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.7])
by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 8C1C4BA3F6F;
Fri, 25 Apr 2025 00:05:05 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-107S001d605ec5c-1638-4f5e-85e9-dfa2c9c76e6a,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 02:04:48 +0200
Message-ID: <20250425000456.14363-3-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250425000456.14363-1-ngraves@HIDDEN>
References: <20250425000456.14363-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15110139703483032290
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=o2kx6R0mL/RPKzMP6ERUAHyKQ6k0KytLNQsyh4NWXU0=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745539506; v=1;
b=xZ7iRVJmA4dw6cNZTanZZWGmIphHtWY3Qmudo3VBArJ/Lxyw6kklVQ9ruovRW2VToP5f2tf4
aqEPotVt8hed7LzrUn4pMrfdIl7ZVR6+i6z4lwq4PlbgSx9eL99vW9rI/2eMoiPVuXXxFbXymmi
ArsDJx1DNc3ekiGkjbwD2/lTe6DaYpBPq8fM8K793zHbVBlmFWUvNW2vn8bCfLRpgkH4rRxKfJr
wTkpf9/vgIrvDkPJoDLWCjeN9ruy1UTdJW/FvPomjzkGCvlcy7kcSKbhzKTScDDrfhgW6uFk8tW
3HqwHpkjXAW8Kyk3gIfW+gSGlMC5/oxBBz7yrxrNy/Fsg==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/waf.scm
(waf-build): Use with-imported-modules around the waf-build builder gexp.
Change-Id: Id242046eb4bfef90dba60d7c3b1b68597ddf502e
---
guix/build-system/waf.scm | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm
index 5f246155141..4ca293ffd89 100644
--- a/guix/build-system/waf.scm
+++ b/guix/build-system/waf.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ricardo Wurmus <rekado@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -86,22 +87,23 @@ (define* (waf-build name inputs
"Build SOURCE with INPUTS. This assumes that SOURCE provides a 'waf' file
as its build system."
(define build
- #~(begin
- (use-modules #$@(sexp->gexp modules))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
- #$(with-build-variables inputs outputs
- #~(waf-build #:name #$name
- #:source #+source
- #:configure-flags #$configure-flags
- #:system #$system
- #:test-target #$test-target
- #:tests? #$tests?
- #:phases #$phases
- #:outputs %outputs
- #:search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- search-paths))
- #:inputs %build-inputs))))
+ #$(with-build-variables inputs outputs
+ #~(waf-build #:name #$name
+ #:source #+source
+ #:configure-flags #$configure-flags
+ #:system #$system
+ #:test-target #$test-target
+ #:tests? #$tests?
+ #:phases #$phases
+ #:outputs %outputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ search-paths))
+ #:inputs %build-inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
--
2.49.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 2/5] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 25 Apr 2025 00:06:02 +0000
Resent-Message-ID: <handler.78050.B78050.17455395148597 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 78050-submit <at> debbugs.gnu.org id=B78050.17455395148597
(code B ref 78050); Fri, 25 Apr 2025 00:06:02 +0000
Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:14 +0000
Received: from localhost ([127.0.0.1]:42824 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u86Z7-0002EY-Nx
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:14 -0400
Received: from 9.mo562.mail-out.ovh.net ([46.105.72.114]:51279)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u86Z0-00028l-91
for 78050 <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:09 -0400
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net [152.228.215.222])
by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClN4q5vz1cfQ;
Fri, 25 Apr 2025 00:05:04 +0000 (UTC)
Received: from director3.derp.mail-out.ovh.net
(director3.derp.mail-out.ovh.net. [127.0.0.1])
by director3.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <78050 <at> debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:04 +0000 (UTC)
Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.27])
by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id
4ZkClN3sSYz82Vw; Fri, 25 Apr 2025 00:05:04 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.4])
by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D6513D43E3D;
Fri, 25 Apr 2025 00:05:03 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-110S004a0430d11-5908-4966-897f-01d31bf1f166,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 02:04:47 +0200
Message-ID: <20250425000456.14363-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250425000456.14363-1-ngraves@HIDDEN>
References: <20250425000456.14363-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15109576751413846754
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht
DKIM-Signature: a=rsa-sha256; bh=PY34uRAwadhi5GAn3F0xkisSYAoCdgA9nJSayToBi5U=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745539504; v=1;
b=b/dbMiG61vNqmVQ5q3ALAK5bF66UlqdRlvWkEPSKoTJGmaHNKjnG7xfCa3KZ+W4npyv8OcwY
6dnAI5hhXN2HWZZtBdk2tONDteGZESp0OMkeSpfFz/4SMV5jJA4rQSUd+l2bgF+n9WQkBIlLdcR
9071k5HcZ+yApRZCVvwomtNgTyumNA9FZ9grCzvQHVfukT+PIn0OJ38/CGN7w1Z26zBN/yOxPuA
/OdpuW1Qsex0k6fPfdPcg0ml0N2DMPro1SJZWixRKSCXjdRQpuz8NQ4M6MSbuBloOjocVV19KHO
kMo0J6Nmg3BLfVXuhQdQgcW/yopHfK4ORR2pxWqLhW4Sw==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/glib-or-gtk.scm
(glib-or-gtk-cross-build): Use with-imported-modules around the
glib-or-gtk-cross-build builder gexp.
Change-Id: I8eaa032ffc0a3f8dbf02c96a4ecee85475c32111
---
guix/build-system/glib-or-gtk.scm | 89 +++++++++++++++----------------
1 file changed, 44 insertions(+), 45 deletions(-)
diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index 6c69a950e81..c912adab4aa 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -225,55 +225,55 @@ (define* (glib-or-gtk-cross-build name
disallowed-references)
"Cross-build SOURCE with INPUTS. See GNU-BUILD for more details."
(define builder
- #~(begin
- (use-modules #$@(sexp->gexp modules))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
- (define %build-host-inputs
- #+(input-tuples->gexp build-inputs))
+ (define %build-host-inputs
+ #+(input-tuples->gexp build-inputs))
- (define %build-target-inputs
- (append #$(input-tuples->gexp host-inputs)
- #+(input-tuples->gexp target-inputs)))
+ (define %build-target-inputs
+ (append #$(input-tuples->gexp host-inputs)
+ #+(input-tuples->gexp target-inputs)))
- (define %build-inputs
- (append %build-host-inputs %build-target-inputs))
+ (define %build-inputs
+ (append %build-host-inputs %build-target-inputs))
- (define %outputs
- #$(outputs->gexp outputs))
-
- (glib-or-gtk-build #:source #+source
- #:system #$system
- #:build #$build
- #:target #$target
- #:outputs %outputs
- #:inputs %build-target-inputs
- #:native-inputs %build-host-inputs
- #:search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- search-paths))
- #:native-search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- native-search-paths))
- #:phases #$(if (pair? phases)
- (sexp->gexp phases)
- phases)
- #:glib-or-gtk-wrap-excluded-outputs
- #$glib-or-gtk-wrap-excluded-outputs
- #:configure-flags #$configure-flags
- #:make-flags #$make-flags
- #:out-of-source? #$out-of-source?
- #:tests? #$tests?
- #:test-target #$test-target
- #:parallel-build? #$parallel-build?
- #:parallel-tests? #$parallel-tests?
- #:validate-runpath? #$validate-runpath?
- #:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
- #:patch-shebangs? #$patch-shebangs?
- #:strip-binaries? #$strip-binaries?
- #:strip-flags #$strip-flags
- #:strip-directories
- #$strip-directories)))
+ (define %outputs
+ #$(outputs->gexp outputs))
+ (glib-or-gtk-build #:source #+source
+ #:system #$system
+ #:build #$build
+ #:target #$target
+ #:outputs %outputs
+ #:inputs %build-target-inputs
+ #:native-inputs %build-host-inputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ search-paths))
+ #:native-search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ native-search-paths))
+ #:phases #$(if (pair? phases)
+ (sexp->gexp phases)
+ phases)
+ #:glib-or-gtk-wrap-excluded-outputs
+ #$glib-or-gtk-wrap-excluded-outputs
+ #:configure-flags #$configure-flags
+ #:make-flags #$make-flags
+ #:out-of-source? #$out-of-source?
+ #:tests? #$tests?
+ #:test-target #$test-target
+ #:parallel-build? #$parallel-build?
+ #:parallel-tests? #$parallel-tests?
+ #:validate-runpath? #$validate-runpath?
+ #:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
+ #:patch-shebangs? #$patch-shebangs?
+ #:strip-binaries? #$strip-binaries?
+ #:strip-flags #$strip-flags
+ #:strip-directories
+ #$strip-directories))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
@@ -281,7 +281,6 @@ (define %outputs
#:system system
#:target target
#:graft? #f
- #:modules imported-modules
#:allowed-references allowed-references
#:disallowed-references disallowed-references
#:guile-for-build guile)))
--
2.49.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 4/5] build-system: ruby: Improve ruby-cross-build style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 25 Apr 2025 00:06:03 +0000
Resent-Message-ID: <handler.78050.B78050.17455395158615 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 78050-submit <at> debbugs.gnu.org id=B78050.17455395158615
(code B ref 78050); Fri, 25 Apr 2025 00:06:03 +0000
Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:15 +0000
Received: from localhost ([127.0.0.1]:42826 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u86Z8-0002Ei-EZ
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:14 -0400
Received: from 7.mo562.mail-out.ovh.net ([46.105.55.234]:59963)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u86Z4-0002Aa-5o
for 78050 <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:10 -0400
Received: from director1.derp.mail-out.ovh.net
(director1.derp.mail-out.ovh.net [51.68.80.175])
by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClS3wCZz1cdj;
Fri, 25 Apr 2025 00:05:08 +0000 (UTC)
Received: from director1.derp.mail-out.ovh.net
(director1.derp.mail-out.ovh.net. [127.0.0.1])
by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <78050 <at> debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:08 +0000 (UTC)
Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.17.28])
by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClS1bTSzHcF1;
Fri, 25 Apr 2025 00:05:08 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.6])
by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 7080BC3A4C;
Fri, 25 Apr 2025 00:05:07 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-113S007fabd4441-a359-4b22-b767-c9d51dabae6e,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 02:04:49 +0200
Message-ID: <20250425000456.14363-4-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250425000456.14363-1-ngraves@HIDDEN>
References: <20250425000456.14363-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15110702650236592866
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=/d6mz+SKT2aK9ebPjs7TpPMcIxrZGwL7B/OCF/OKMak=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745539508; v=1;
b=WuAsFER33FeAttrkHQB4izkcw9bHD58SzFua+i1SS3A04TasmK1DcVgHfEWTxh/bbN0cDq58
p34t+67aiHPICFjt4VzToRYMuXuGeLJesf5o9ZMKIraKy241lXUICLj2mxXb/8nWFz4sqZCBOEG
ZrabxoJ88GlZZQPdNK4gV4q7MLT7og/GQS/r4sLQ6FiDeJ5huPkjNgNHnX73Nu3QoKIiLi05Ai6
nTwXQt2u2jZ3BuMEviKf1T0Q00DzPv3J8OPN0w2TwedcqG9WOjzLpNoCI7RJqNp5NT92mqEZ6JA
4xgTRF8jarwvssTx4Dpk6oZocMniXkEnqF+AsFPhJ04Xg==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build-system/ruby.scm
(ruby-cross-build): Use with-imported-modules around the
ruby-cross-build builder gexp.
Change-Id: I1051124f034f2082ccef531e9bcf37913d5a9449
---
guix/build-system/ruby.scm | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm
index 33aab5f7190..f258ade6e75 100644
--- a/guix/build-system/ruby.scm
+++ b/guix/build-system/ruby.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 David Thompson <davet@HIDDEN>
;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -88,24 +89,25 @@ (define* (ruby-build name inputs
(guix build utils))))
"Build SOURCE using RUBY and INPUTS."
(define build
- #~(begin
- (use-modules #$@(sexp->gexp modules))
+ (with-imported-modules imported-modules
+ #~(begin
+ (use-modules #$@(sexp->gexp modules))
- #$(with-build-variables inputs outputs
- #~(ruby-build #:name #$name
- #:source #+source
- #:system #$system
- #:gem-flags #$gem-flags
- #:test-target #$test-target
- #:tests? #$tests?
- #:phases #$(if (pair? phases)
- (sexp->gexp phases)
- phases)
- #:outputs %outputs
- #:search-paths '#$(sexp->gexp
- (map search-path-specification->sexp
- search-paths))
- #:inputs %build-inputs))))
+ #$(with-build-variables inputs outputs
+ #~(ruby-build #:name #$name
+ #:source #+source
+ #:system #$system
+ #:gem-flags #$gem-flags
+ #:test-target #$test-target
+ #:tests? #$tests?
+ #:phases #$(if (pair? phases)
+ (sexp->gexp phases)
+ phases)
+ #:outputs %outputs
+ #:search-paths '#$(sexp->gexp
+ (map search-path-specification->sexp
+ search-paths))
+ #:inputs %build-inputs)))))
(mlet %store-monad ((guile (package->derivation (or guile (default-guile))
system #:graft? #f)))
@@ -113,7 +115,6 @@ (define build
#:system system
#:target #f
#:graft? #f
- #:modules imported-modules
#:guile-for-build guile)))
(define ruby-build-system
--
2.49.0
X-Loop: help-debbugs@HIDDEN
Subject: [bug#78050] [PATCH 5/5] build-system: android-ndk: Improve style.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 25 Apr 2025 00:06:03 +0000
Resent-Message-ID: <handler.78050.B78050.17455395158627 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 78050
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 78050 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 78050-submit <at> debbugs.gnu.org id=B78050.17455395158627
(code B ref 78050); Fri, 25 Apr 2025 00:06:03 +0000
Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 00:05:15 +0000
Received: from localhost ([127.0.0.1]:42828 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u86Z8-0002Ez-U7
for submit <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:15 -0400
Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:55567)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
id 1u86Z5-0002BZ-ND
for 78050 <at> debbugs.gnu.org; Thu, 24 Apr 2025 20:05:12 -0400
Received: from director4.derp.mail-out.ovh.net
(director4.derp.mail-out.ovh.net [79.137.60.37])
by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkClV1pymz1ccb;
Fri, 25 Apr 2025 00:05:10 +0000 (UTC)
Received: from director4.derp.mail-out.ovh.net
(director4.derp.mail-out.ovh.net. [127.0.0.1])
by director4.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
for <78050 <at> debbugs.gnu.org>; Fri, 25 Apr 2025 00:05:10 +0000 (UTC)
Received: from mta11.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.25.205])
by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id
4ZkClV1Pp2zyBw; Fri, 25 Apr 2025 00:05:10 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.6])
by mta11.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9E02B263A4C;
Fri, 25 Apr 2025 00:05:09 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
(GARM-108S002292b331a-07f0-4f12-9d36-39cf86546d4f,
0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Fri, 25 Apr 2025 02:04:50 +0200
Message-ID: <20250425000456.14363-5-ngraves@HIDDEN>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250425000456.14363-1-ngraves@HIDDEN>
References: <20250425000456.14363-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 15111265603241763554
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvhedtkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht
DKIM-Signature: a=rsa-sha256; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=;
c=relaxed/relaxed; d=ngraves.fr; h=From;
s=ovhmo4487190-selector1; t=1745539510; v=1;
b=t98xoax4exoTR6Vajoa7SjeEhCGlaR2n8MY2R1+4ipDHIGwHyaGTM9Q9Hhz33P5e0V20s/XT
LwSKvJivmCvYqBbfpkS7r2CNdWKLaL1OyXhDg5zDpSSAo5GmTZD2DWTKzMH2WbvhBiapIftMMgx
YgYnoxN31NYttuW+g8g7Qi+dKXDQzj0osPu6i744QVxES6w8SUrgjuep9jogcqyJacLssZB6ZO4
Iaue/UGGS9JQH7e4jxYaVIxpZvh29GKf7z6jxVGd1IGQmOeMZFIqIjJFCVlQsvSE+ChE0IH9xxA
N24nOPWC6RZvuLZ1SdfQVg7OEKbn4K8bV1hAaCgUEIRDQ==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Like in other build-systems, make proper procedures to resolve the
build-system build-inputs bindings.
* guix/build-system/android-ndk.scm (default-android-build,
default-android-googletest): Add procedures.
(lower): Use them.
---
guix/build-system/android-ndk.scm | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm
index b8cd56b8719..565ec1d3632 100644
--- a/guix/build-system/android-ndk.scm
+++ b/guix/build-system/android-ndk.scm
@@ -33,6 +33,16 @@ (define %android-ndk-build-system-modules
`((guix build android-ndk-build-system)
,@%default-gnu-imported-modules))
+(define (default-android-build)
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((android (resolve-interface '(gnu packages android))))
+ (module-ref android 'android-make-stub)))
+
+(define (default-android-googletest)
+ ;; Lazily resolve the binding to avoid a circular dependency.
+ (let ((android (resolve-interface '(gnu packages android))))
+ (module-ref android 'android-googletest)))
+
(define* (android-ndk-build name inputs
#:key
source
@@ -100,8 +110,8 @@ (define private-keywords
;; Keep the standard inputs of 'gnu-build-system'
,@(standard-packages)))
- (build-inputs `(("android-build" ,(module-ref (resolve-interface '(gnu packages android)) 'android-make-stub))
- ("android-googletest" ,(module-ref (resolve-interface '(gnu packages android)) 'android-googletest))
+ (build-inputs `(("android-build" ,(default-android-build))
+ ("android-googletest" ,(default-android-googletest))
,@native-inputs))
(outputs outputs)
(build android-ndk-build)
--
2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.