From patchwork Tue Aug 12 09:04: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: 43372 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 A44B327BC4A; Tue, 12 Aug 2025 10:07:32 +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 3AB5D27BC49 for ; Tue, 12 Aug 2025 10:07:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ulky9-0007Kl-Ql; Tue, 12 Aug 2025 05:06:58 -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 1ulkxV-0006qX-Gm for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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 1ulkxV-0001KY-7m for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -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=Dpm41g22BGpFEgOSb8PGd1vY32ufBnPyhRO/9Go62OM=; b=n9gZe+SGzkRvi5rbU0kFihavUG/ea3Xmxe+8GfmUJQSHxLqiZx24A42tanTlzhAdzOaj+HVKCHOb7QK1OAwz3jpXELiL6TcXuZc7H9nddmI75uWVjesqOaY0BODSUR3ZCxT5hSfIPmqiYvqtlgWXH4tQMG2+HvtS7KgyIoWJV4+KpOL2Ajp8RM4WBT7o0D2vfwdzAuZbg3afXiUbRO/femSkcSWiXW04hT/V/d5aBozLluuBpj4vMz0t4J+b3VwryrWJQw9SOtQIULtWq/DOM7wQtmO7iolG270r+MlB/cXYd13Sn2GC3ebcbKHMyvx88ayOdXi2DTgcgb3Ms5M7tA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ulkxV-0007jZ-1M for guix-patches@gnu.org; Tue, 12 Aug 2025 05:06:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79224] [PATCH 25/43] build-system: meson: Redefine meson-build and meson-cross-build. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Aug 2025 09:06:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 79224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79224@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 79224-submit@debbugs.gnu.org id=B79224.175498956329459 (code B ref 79224); Tue, 12 Aug 2025 09:06:16 +0000 Received: (at 79224) by debbugs.gnu.org; 12 Aug 2025 09:06:03 +0000 Received: from localhost ([127.0.0.1]:51846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ulkxG-0007el-0w for submit@debbugs.gnu.org; Tue, 12 Aug 2025 05:06:03 -0400 Received: from 6.mo563.mail-out.ovh.net ([46.105.55.200]:52945) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ulkx1-0007c8-BC for 79224@debbugs.gnu.org; Tue, 12 Aug 2025 05:05:48 -0400 Received: from director4.derp.mail-out.ovh.net (director4.derp.mail-out.ovh.net [79.137.60.37]) by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZx4mfSz6MjK; Tue, 12 Aug 2025 09:05:45 +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 <79224@debbugs.gnu.org>; Tue, 12 Aug 2025 09:05:45 +0000 (UTC) Received: from mta6.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.101.120]) by director4.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4c1QZx3mt0z1xqG; Tue, 12 Aug 2025 09:05:45 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.8]) by mta6.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id EC9928E327B; Tue, 12 Aug 2025 09:05:44 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-114S0083126dc35-757d-47b3-be0a-9806bf0abe5c, C5D759281D113BF028CC7F145FFAF0A9AC8DF452) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.146.16 Date: Tue, 12 Aug 2025 11:04:33 +0200 Message-ID: <20250812090457.19016-25-ngraves@ngraves.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812090457.19016-1-ngraves@ngraves.fr> References: <20250812090457.19016-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 281756454193521378 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeffedrtdefgddufeegledvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudegiedrudeinecuvehluhhsthgvrhfuihiivgepuddvnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeelvddvgeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=Dpm41g22BGpFEgOSb8PGd1vY32ufBnPyhRO/9Go62OM=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1754989545; v=1; b=MFilO2lSixGSqnbN9mzhpxWUfCSYjP8iuIKRP8DyO6ZMxwcyVopRvuak5O+RavFT07HhSEnU F+ul1ZgIwcGAyi9Xcovr6y0frnWjEYcQwJW2E0lOFRjWRSLzXgU1ihjkDuQm+VCyzYuVAP2J2WY 5r2pqM3LoPYyHylj217VhxNJj/Gsel7u1GbLxTTdVP6eoE9MuGzCgolDxw6CuqYTY4Bm3ZKhygq 7zbxj4uFwe39XJYQWo/FTg/kxxl8jLmAw67XUYyWbgSKXfT3XWeoMmsyPdvNjribUFafy6uapL/ tebG1bbvwY2J9HKckLABXjE9Gq1+WbaanC8e7D+fI+niw== 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/meson.scm (meson-build): Monadic procedure returns a gexp instead of a derivation. (meson-cross-build): Monadic procedure returns a gexp instead of a derivation. Change-Id: Id801e757463080dbeedc05a43bd0b2ae23fae4c7 --- guix/build-system/meson.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 612e148fb64..a8a9ece9ef9 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021-2022, 2024 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,16 +255,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories)))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target #f - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define* (meson-cross-build name #:key @@ -370,16 +363,8 @@ (define build-phases #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories))))) - (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) - (gexp->derivation name builder - #:system system - #:target target - #:graft? #f - #:substitutable? substitutable? - #:allowed-references allowed-references - #:disallowed-references disallowed-references - #:guile-for-build guile))) + (mbegin %store-monad + (return builder))) (define meson-build-system (build-system