From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mBP9Cz2tm2W7qwAAkFu2QA (envelope-from ) for ; Mon, 08 Jan 2024 09:07:25 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cMYVCT2tm2WTcQAAqHPOHw (envelope-from ) for ; Mon, 08 Jan 2024 09:07:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704701244; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=IFo4jOppcyJ4C4f7sFwc0dgsuLLzYce1OTfggQDmVf0=; b=Xh7pWHhFhxCBaOBWsGXuHifxaxRIM1zkb9mCZaDkPgcLp7+sEe3Kb8nPsCreUdrLJaHcF2 9mGQq1icdhlCqeorS08gj4LVGkWlmpCMBBwJgfq8CrPOSPYhhd56iFmwpE8xLcNMg579uB msYL7EPBEqX3bDVy5Xakt5bheaXe1gxDcCY8gAojAXoDl77hmzqRTYcusVxQmRjmb7AvtR wtQjzgvQ1k5HHZzBkhNCjq6Kn0iNIV83RkOd9SJHU51h8UdAPl2Ulx4quBFaS/0B8kjW6v B4aRTyXwxP+aiHz6l20WpIM8Gc2/kbPDHik1eqGmReQus6mMMN8p6qBriEPuiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704701244; a=rsa-sha256; cv=none; b=pIeyA43/WoGSNey2lfa9ZKpFsK20CIwualzIM12kmiFnKouvJczv2qbOt1saLkvVeYVZuJ xLoOvkPTQauVSiuxnH7FmcGLAeSBbKy5Q2qWi441Go1e8IdkNNCnMP89nCjPrtm/wuiHIN J4hft1fesfHRvKN7YAyK5TXXYgmjRvGQnEKT1nlql73HwNxm1hH3MK1+dXpvvv8Wz1u03A qSJ/4fZNkRg/WZCfRJx29Mm+jjWNv1L6xv6lbXK6fm8LoBH0DMvzGdzERKmFKkSCyFTf+n 2nDa/4ZRtWYr01ZoslMDJSrGiWBZpii0Cwg2BMnP/VTZ62LrGbOyL2P/ds8S2g== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DDA1115B54 for ; Mon, 8 Jan 2024 09:07:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMkdH-0003Vy-15; Mon, 08 Jan 2024 03:05:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMkdC-0003P5-5S for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rMkdB-00031C-TY for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rMkdH-00084E-U4 for guix-patches@gnu.org; Mon, 08 Jan 2024 03:05:15 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68315] [PATCH 27/48] 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: Mon, 08 Jan 2024 08:05:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68315 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68315@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 68315-submit@debbugs.gnu.org id=B68315.170470108330526 (code B ref 68315); Mon, 08 Jan 2024 08:05:15 +0000 Received: (at 68315) by debbugs.gnu.org; 8 Jan 2024 08:04:43 +0000 Received: from localhost ([127.0.0.1]:34980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkck-0007wA-O0 for submit@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:43 -0500 Received: from 3.mo550.mail-out.ovh.net ([46.105.60.232]:35917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rMkcc-0007uZ-Om for 68315@debbugs.gnu.org; Mon, 08 Jan 2024 03:04:35 -0500 Received: from director6.ghost.mail-out.ovh.net (unknown [10.108.2.160]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 790122A058 for <68315@debbugs.gnu.org>; Mon, 8 Jan 2024 08:04:27 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-tglz6 (unknown [10.110.178.62]) by director6.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0C4911FEA9; Mon, 8 Jan 2024 08:04:27 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-tglz6 with ESMTPSA id G+pWB4usm2VOAwAAP3B3dg (envelope-from ); Mon, 08 Jan 2024 08:04:27 +0000 X-OVh-ClientIp: 81.67.146.208 Date: Mon, 8 Jan 2024 09:02:59 +0100 Message-ID: <20240108080350.1665-27-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240108080350.1665-1-ngraves@ngraves.fr> References: <20240108080350.1665-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 12433031199387869922 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrvdehiedghedvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvleelgeeffeetleekueegvdfhtedvueffiefhkedtleejkeduveelgfdufeduleenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpeehnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieekfeduheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.79 X-Spam-Score: -6.79 X-Migadu-Queue-Id: DDA1115B54 X-TUID: 371KKRPUO6zt * 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 bf9ca15ecc..410d981bf0 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021, 2022 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Efraim Flashner +;;; Copyright © 2024 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -237,16 +238,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 @@ -350,16 +343,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 -- 2.41.0