From patchwork Fri Apr 25 09:26:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42000 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 6386D27BC4A; Fri, 25 Apr 2025 10:29:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F38BD27BC4C for ; Fri, 25 Apr 2025 10:29:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FMu-00059C-I5; Fri, 25 Apr 2025 05:29:15 -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 ) id 1u8FMl-00056f-Bc for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 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 1u8FMk-0007pD-Tq for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7SZDFN585hnsC5yHLdKAqhWrvuWcWw9NsXkLfx7Ry+w=; b=nF6qs3KIlV63TnmGm9CLk14OcohzJC2/Vj5qt3ys+Y72y78guhp+mLz/zeUE+M/hAbXjWBVmI03BK61Ipj53kd3I6g5LynRz4bFQzkBoCToAgOUe9ZC6p0Ac2pEnx8Ob2oMD2lB64wC9ocZ/cvU4+ZMemmZ1ofj5HDSmWDvoWh3YS4xTZak+XX1vw4dU3crsmC43GMP6U5P2B2oHvyiQJkz+ey+VfJbAqGSZFShkkg0HKa2DlFYqg4R3IMtu/av7Pi3knlThfLd2CqEkgim6f43BMGgNzNur2+wPuTMvjEBwso1IhI9ja3uXg1YpWXuS2MnP+Rpg/J7PnDrh3006tg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMj-0000S9-OD for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 1/5] build-system: gnu: Improve gnu-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455732951618 (code B ref 78050); Fri, 25 Apr 2025 09:29:01 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:15 +0000 Received: from localhost ([127.0.0.1]:47366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FLz-0000Py-3F for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:15 -0400 Received: from 3.mo563.mail-out.ovh.net ([46.105.40.8]:49379) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLt-0000P2-Sf for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:11 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF417JXz1dVp; Fri, 25 Apr 2025 09:28:07 +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@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:07 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.164.80]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF34N2JzHcF5; Fri, 25 Apr 2025 09:28:07 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 0838CD43E3D; Fri, 25 Apr 2025 09:28:06 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002af2affa0-3c28-4a38-a268-83ec6990e422, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:30 +0200 Message-ID: <20250425092759.30369-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6171901817855271650 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=7SZDFN585hnsC5yHLdKAqhWrvuWcWw9NsXkLfx7Ry+w=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573288; v=1; b=to4Hq8Y4dRYKUKDiKE694TgVQbDfeJcLcBpMhAtxLLRB+Ok43ND9JxoV+DmdKYruknBQeuWh uhEY40ACaBTcuadfF0M1XQ+SlOZvvKvkHqVXll3hH5D58lv5MtaaFhyS3LO8mMrU1RUhiH854gn gvAVCzXTX6u1ciBBfs/RLDSTIHPAn/5Rb4SJju9fOdDfWF/0HkSBGjt71H9m7WYbj4VbgnMasvI SzwsMlPmuD7EYll06mTqJZpineiX5hHU4T8Abr32LisLr9ZUIob412T8Cuz4upW6Jm5VLJORZFV USosjcmZpinFUM9GZBGbZmmW399ZDk/CJ7sLiz0K4X8ow== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * 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 | 97 ++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 3a314d34b72..8f0883956e3 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 +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -520,65 +521,65 @@ (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 #:target target #:graft? #f - #:modules imported-modules #:substitutable? substitutable? #:allowed-references allowed-references #:disallowed-references disallowed-references From patchwork Fri Apr 25 09:26:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41999 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 66E5B27BC4F; Fri, 25 Apr 2025 10:29:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 F00AB27BC4A for ; Fri, 25 Apr 2025 10:29:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FMz-0005Bn-46; Fri, 25 Apr 2025 05:29:17 -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 ) id 1u8FMl-00056e-BU for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 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 1u8FMk-0007pS-Si for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PY34uRAwadhi5GAn3F0xkisSYAoCdgA9nJSayToBi5U=; b=eau7UyPBUcX7sd0I0r5kD5K4yXCqitELTsFdi6ho8virejIF09Gqp0zwRMOk3tEiAJVxi2brKHwCDGihedCLzP4fcGXl6Yl4bMoksSTiVARM6tVTaFVp6qJQij6oKdNlRYHoyauUbUs3FiQxbe2LWPUSXEjuMgqmYKXrSgswDYoZmMX9G/JzXk4FbM23p1ZxHYflKyfVXOJbLvuXVH2VsErH3BoXH+xhohWSAiZw6W4GVEm0lMrfLJ5+j55eaSCb0c6lBsrJixO9Lky1FMEYSY6ow4iT5AqFfGiV0We5ZojAQacx190zFYv4KfKLS3E1EKIs8M/sI1e08ZyEoX0LGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMk-0000SR-Oc for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 2/5] build-system: glib-or-gtk: Improve glib-or-gtk-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455733061650 (code B ref 78050); Fri, 25 Apr 2025 09:29:02 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:26 +0000 Received: from localhost ([127.0.0.1]:47371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FM9-0000QX-7n for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:25 -0400 Received: from 9.mo563.mail-out.ovh.net ([46.105.73.201]:46409) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLw-0000P5-3H for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:12 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF51DZzz1dVk; Fri, 25 Apr 2025 09:28:09 +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@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:08 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.35]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF462wjzHcF1; Fri, 25 Apr 2025 09:28:08 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.5]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 39198BA3F1A; Fri, 25 Apr 2025 09:28:08 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-95G00110890de6-7c88-45e3-9064-c6f1a16dae07, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:31 +0200 Message-ID: <20250425092759.30369-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6172183291077190370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehieefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=PY34uRAwadhi5GAn3F0xkisSYAoCdgA9nJSayToBi5U=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573289; v=1; b=LwFhJhGdKH73r77yVn7g1idzIhjjGIrQg5XM7RDHbWJ1UWrL2Bd1B6G6cuNMi8OxHNxT/z+/ og4xY7pbvDxovawKtt3b43zWt59RPwN5EYoYPn/4G2D5VO68tw+D/GNxes9B3FQ6VQr/7+JhEGr +mI6uJxCwOEh44o4S5WnXqOpcPveEl9iPXT6FMSIl6TTONuMQ0NtXajvLj15fDiPpiJxa/eOa1d CnS5/69hsl6sj4o8D7ZRApni8l8zXa4t1SSUP7tz/1MKUir6AMELU8T8DOTcDeEclXK1gdLh+o7 dXg5OWA4PLkt2STTReO++x3jo36VbFSN6tFbZFvM6P8pw== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * 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))) From patchwork Fri Apr 25 09:26:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42002 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 B355027BC4B; Fri, 25 Apr 2025 10:29:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 3A22A27BC49 for ; Fri, 25 Apr 2025 10:29:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FN2-0005E9-7H; Fri, 25 Apr 2025 05:29:20 -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 ) id 1u8FMn-000587-Aq for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:06 -0400 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 1u8FMl-0007pf-FJ for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=o2kx6R0mL/RPKzMP6ERUAHyKQ6k0KytLNQsyh4NWXU0=; b=EO01zaRbxq0Cq4+oIEigxSxzT/gEXY9YxqccJKg2vTQA8C8DMvn+X0eB6Ai8o3rt9ONBWXIgU/B2Hi9UBFxI7ie5mryRIU0kGDyTc6OlP5XxqlPbZ8ycknqFnp9+pf4LgqZfI0+JMJ7D/sBzk30frVxvWE/xU+SsnMbQkPzH5XqlokDXQ/BR35QK7efhmR7ucwQ+sGs7QUG5SWSDPa5E8U+cBGuND7EKkN8feYw9w4CEWYQv5JjrUqUKZtVPaD037QdN4c13KiAKrsubGS7VTv8K6rEHBxReWxLrPP2lSF0t/vKm7AIQY242LGta7us/jLWyrNo8KsNNHqGRPqcA4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMl-0000SZ-7R for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 3/5] build-system: waf: Improve waf-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455733061658 (code B ref 78050); Fri, 25 Apr 2025 09:29:03 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:26 +0000 Received: from localhost ([127.0.0.1]:47373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FMA-0000Qf-7F for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:26 -0400 Received: from 4.mo563.mail-out.ovh.net ([46.105.53.192]:54673) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLw-0000PC-Ms for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:13 -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 4ZkSF62cRDz1dR8; Fri, 25 Apr 2025 09:28:10 +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@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:10 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.253]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF61g88z82Vs; Fri, 25 Apr 2025 09:28:10 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.7]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 9612EC3A4E; Fri, 25 Apr 2025 09:28:09 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-112S0067baf9b3f-1cae-477e-a78b-b62d83de7071, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:32 +0200 Message-ID: <20250425092759.30369-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6172746241391125218 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=o2kx6R0mL/RPKzMP6ERUAHyKQ6k0KytLNQsyh4NWXU0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573290; v=1; b=ieXhArQYBdl+cirAtJ8Yw1CmykdUWrmucKV121p7TyU6/E6gcm0eBBs2sRTEocR76z0Y3NZo DHF694nYiF5RvEoBd56XRLTcxMSzPDmAjwE9iMk6Suv4xo5WUdW38eD/7+ZbTjXpXGHsuftwan0 SQxhztPn1Xe/PdMoaKd0CRgew+h6Vp4KXpYOAF3CQ0XoY85EmcSQjEaxxZK+VotfH13gGsHJSH5 p2vA5GdCygV3Nj1+az0I3jhLDPVWXWpgdYIrE3QkSn3ecMTZ0rqyqSitsthWYASu4lhBeF3UQ8/ ZpaIow0BKWUSKtfIpWldqMOLQB5ByV50iVFxWt2nR980g== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * 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 +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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))) From patchwork Fri Apr 25 09:26:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42001 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 A3C9027BC49; Fri, 25 Apr 2025 10:29:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 36DB127BC4D for ; Fri, 25 Apr 2025 10:29:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FMz-0005Cf-6q; Fri, 25 Apr 2025 05:29:18 -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 ) id 1u8FMn-000586-AX for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:06 -0400 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 1u8FMl-0007pm-UP for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=/d6mz+SKT2aK9ebPjs7TpPMcIxrZGwL7B/OCF/OKMak=; b=TprSjUh78HdjcoZQB8f7x1hYOMc9hMkKcP0j9AFvW8UpAYnNqplRQH+DLwUYuNcs9ODp0N0KTIRTkwKUdn7c2AtEbeVImdXVPOOJe2uWnLwphUEO0Hcpsk/gG/H0760UVjmJfGXEiGp1nfmt01+aRtoMjjG2VvtFnAFtkFm5HfDI8Dx47J/VNMuGKb6sSTN4zTBLolrGcsRGmD5DiAUOBy2Ooc6EnB4cn4GAC/eWsvjjsQ2mNuxY1FlxDUxCTz61HRlHA8bdr2F89NQCRXZxpytg6d5zLaruZVes3O79igj5yGSnohQpt7KUTO6WRQHxauSjdm01JLn2OqC/RmbKWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMl-0000Sg-Nw for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 4/5] build-system: ruby: Improve ruby-cross-build style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455733071666 (code B ref 78050); Fri, 25 Apr 2025 09:29:03 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:27 +0000 Received: from localhost ([127.0.0.1]:47375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FMA-0000Qn-Vx for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:27 -0400 Received: from 5.mo562.mail-out.ovh.net ([46.105.48.192]:50231) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLx-0000Pa-PH for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:14 -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 4ZkSF76FYYz1475; Fri, 25 Apr 2025 09:28:11 +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@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.168.118]) by director3.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF72nPDz7wVj; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.6]) by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id DA0C7BA3F7D; Fri, 25 Apr 2025 09:28:10 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-104R005853271cf-54b4-448c-bdfb-45e30a02f9da, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:33 +0200 Message-ID: <20250425092759.30369-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6173027716027507426 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeektdehtdesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=/d6mz+SKT2aK9ebPjs7TpPMcIxrZGwL7B/OCF/OKMak=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573291; v=1; b=k7cq/AdovXG3GxXXFf33/AMQQBqhhYwyFdnE0C+tPyGTHLe2XzLDGZ7jVxOoXzkGUnHpP6fI J2TP68WXK1lbQ4bRU2qNb9rSJUrbrM64KmoWRydyx91ixCFkcnMD55GgosvEgVk79Ut8/pFGTaM MA8EcfY8uVJ/IPKO9dhUCMD3L2h2RNIftAJUc6ZEGNBnvbIc37Y0URnytCr77TxtR3POPp93zVB Xy8ib1Vtb5Qg4LpfCVfjfS/o2uvyPU/XgezrJaWN0WVgu1C/PjDa8zJoT9MUYrTwW/xdDpq/HVX WmzJ9hhtc/bPooIXXeYzmitDuVLgRgw0ym8Q2oLVbsuxg== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 * 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 ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès +;;; Copyright © 2024 Nicolas Graves ;;; ;;; 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 From patchwork Fri Apr 25 09:26:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 42003 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 5E93327BC4B; Fri, 25 Apr 2025 10:30:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D8DC227BC4A for ; Fri, 25 Apr 2025 10:30:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u8FN4-0005EQ-31; Fri, 25 Apr 2025 05:29:22 -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 ) id 1u8FMn-00058B-Br for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:06 -0400 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 1u8FMm-0007pq-Fu for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=; b=upjvp7XnbOkuoIOd+tihRfMdy8U/24GFE+InUaG1jFOZ/n/Xw66mjEh6EUqXACHAvMX3ES7ELYntSVGp6jbQU8FKL9yk1N+7kabIb7VwYzdZ/O7y83+y3b5K1+XG0mSJRIuaI/S2xngvcGiVtbSO3HOuGryZfpTxquy0tKAxKLJyTNaLxxYvf1HSeBd8GCAibIj5ktWErzuXN7wxJA3176QmaNOpFJem6ClZ4fVsdzDS3XgdAdMnAIzLyDLiDRg816vt/qa1+n0HpbWD/d0ciCJIhqU8RKoZjWqA99KbZXItCYfwUHpZrNhaW4Czp7NaIGQfLMchobuadm8BpqET4g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u8FMm-0000Sp-9L for guix-patches@gnu.org; Fri, 25 Apr 2025 05:29:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78050] [PATCH v2 5/5] build-system: android-ndk: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Apr 2025 09:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78050@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 78050-submit@debbugs.gnu.org id=B78050.17455733081673 (code B ref 78050); Fri, 25 Apr 2025 09:29:04 +0000 Received: (at 78050) by debbugs.gnu.org; 25 Apr 2025 09:28:28 +0000 Received: from localhost ([127.0.0.1]:47377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u8FMB-0000Qv-HK for submit@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:27 -0400 Received: from 6.mo562.mail-out.ovh.net ([46.105.48.43]:54579) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u8FLy-0000Pk-BC for 78050@debbugs.gnu.org; Fri, 25 Apr 2025 05:28:14 -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 4ZkSF85dJVz10DW; Fri, 25 Apr 2025 09:28:12 +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@debbugs.gnu.org>; Fri, 25 Apr 2025 09:28:12 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.109.176.253]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZkSF83Vt3zHq2L; Fri, 25 Apr 2025 09:28:12 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id D92C1C3A4E; Fri, 25 Apr 2025 09:28:11 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-99G0032f5e7004-5fe0-4844-b05f-f0d65732bd92, 0A0AE3EC9A8D3E829919296CBA8C7C69D15B3FB7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 25 Apr 2025 11:26:34 +0200 Message-ID: <20250425092759.30369-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250425092759.30369-1-ngraves@ngraves.fr> References: <20250425092759.30369-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 6173309193408930530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvheduleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepvddprhgtphhtthhopeejkedthedtseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdfovfetjfhoshhtpehmohehiedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=P01vXPd9IYUvGbcI+WUr3EUkYr3FEwOlz9scZ2ydV7c=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1745573292; v=1; b=zF5eAStw6U21eFSz/wL6uOK8Uz8yHrwzs1E6Ivh+T8mio92P0fEg7VzWis0rnECDXhIDU2bM CzUXgzKwWKLq8YZEKnlFVbgAReyPUowCjmBT523hxIKWHd9L50zxKSJbPl4giVLzRYb3cN486Qb TX9DuGHD5eLVH0RNguMcN3+RrmDyfD3b/d4iF69Mmgesbwk3tD/LxEODeEC3G2vr1HH1Gmv0wWS wjr9AQmrt30syxsPIL2feG4kRN9EAmXv5YK/2KUQnAiCJwnCzBhK0lNqjWTxOoZsh3AcvzSkwqC xwZL2Pl3qOSixYSa6HunY5ic2yW1oE6Li1Q65yDWC0NcQ== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 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)