From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YH63I8qml2GBigAAgWs5BA (envelope-from ) for ; Fri, 19 Nov 2021 14:29:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oGJHH8qml2EjawAAbx9fmQ (envelope-from ) for ; Fri, 19 Nov 2021 13:29:46 +0000 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 355AAB384 for ; Fri, 19 Nov 2021 14:29:46 +0100 (CET) Received: from localhost ([::1]:54924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mo3xZ-0002Fa-B8 for larch@yhetil.org; Fri, 19 Nov 2021 08:29:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo3hO-0002ol-Ft for guix-patches@gnu.org; Fri, 19 Nov 2021 08:13:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mo3hO-0006hs-1x for guix-patches@gnu.org; Fri, 19 Nov 2021 08:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mo3hN-0005Kc-U5 for guix-patches@gnu.org; Fri, 19 Nov 2021 08:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51948] [PATCH] Meson needs proper wrapping Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Nov 2021 13:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus Cc: 51948@debbugs.gnu.org Received: via spool by 51948-submit@debbugs.gnu.org id=B51948.163732757720483 (code B ref 51948); Fri, 19 Nov 2021 13:13:01 +0000 Received: (at 51948) by debbugs.gnu.org; 19 Nov 2021 13:12:57 +0000 Received: from localhost ([127.0.0.1]:38374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mo3hI-0005KJ-V0 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 08:12:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mo3hG-0005K3-MM for 51948@debbugs.gnu.org; Fri, 19 Nov 2021 08:12:55 -0500 Received: from [2001:470:142:3::e] (port=55484 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo3h9-0006gQ-0j; Fri, 19 Nov 2021 08:12:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=w5URk7kdjNn4P5mLajcjk65YiKKUsN9eunwZngSZmYU=; b=AMr+KmDYs6kfQhg+uTnk Lz9m+8c5RYvJWYKdPlURL8zppYnt6EAFUeyJ0fDd5LkWQglbVi3cSbOYTwaneNv/bckSPhHyaqr/Z l0gMQM8hCPsb3YbkL4iWfE2PuAShvz26AybP1ZdC24xDWYQhEiqR/VZVXofrHmpK/tgSCZ7oOEVtN Dqj6n+UP1UdtgzMVZLgBmGOWGDFfWtA8wIA+PBzFAOITXQrkCKvchZ+sb2swJd+rbroDohmpQuxf2 MEyKQ3N9BxwjgFC1Tb5PZLvVV5PfeTsM7FF8v4dweqfV3A/CXJDgUvX6ssk+icLfRhfXvtrXCiQka 42PUav4VmvYVFg==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=47276 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mo3h8-0006Tf-NN; Fri, 19 Nov 2021 08:12:46 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87r1bda6ff.fsf@planete-kraus.eu> Date: Fri, 19 Nov 2021 14:12:43 +0100 In-Reply-To: <87r1bda6ff.fsf@planete-kraus.eu> (Vivien Kraus's message of "Thu, 18 Nov 2021 15:23:48 +0100") Message-ID: <8735nsmgqc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637328586; h=from:from:sender:sender: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:dkim-signature; bh=w5URk7kdjNn4P5mLajcjk65YiKKUsN9eunwZngSZmYU=; b=Z0lexfdxRg90FIYk44iMvi3pWMf1U2/Aon08+lYewZj267IEPtBioHfk3/7XQgi0pZRM5p vhbl5gUtl1i7J1mJjsJV/8mIqUXXhNSBbnJz6TCRyuFzoYwdGBsdr3RvCZeFqhyJ5v1Qnv TjlQ19NWRG2G11Ej0j89zbIV19AzeBW+07/O+c2JYhMaJl7YlY5sEPNb3MUr+6zqjHbiqk 7w5HWlwk4Rd4R3MvpzSXVe1ggj6sV4WxOwgd43RhlFFN5ufZgtv+CJbpwBTOnQl74o5xqF UK8kYrBbXZNPbw7cGNS5+nlX22GJa3JBe42I/hvkpxhvNeXSjLC2I1n7wE6cFQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637328586; a=rsa-sha256; cv=none; b=hkC4NBUb3tVwtHUYOA8s74JN38wppLiOIV2Bst1unBYRSe+sUDds11Tv83fbWjbllzHfcU I70fknoEGh6iYprynBMcoKWAw6qa99KR2zY6DjKlKnW11sAbwTVjymsYXndIc4iAHvPsT5 oC/A7N7Zl2+obddt5iel6fM8rem9U5jslKPEd+2oyx7ncNCL0za7uYkewNS3XYnQ7DfM0n xQqT+cGgPequhJonXVU3hK6WpL0mclBxKnrqKNBAYB3WPYNMITsE4LnysJccIQCdI+4xkL 5WHgua8crx4aOa0aOUSOsuHIWIqv2cFp8zUHmWErysulysicNBbyKm3IXVn5TQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AMr+KmDY; 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" X-Migadu-Spam-Score: -2.06 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=AMr+KmDY; 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" X-Migadu-Queue-Id: 355AAB384 X-Spam-Score: -2.06 X-Migadu-Scanner: scn0.migadu.com X-TUID: 97M/PChSB6c8 Hi! Vivien Kraus skribis: > Meson needs to be wrapped, but the wrapping must not execute a new > process, if I understand correctly. I could use wrap-script, but I think > it=E2=80=99s more pythonic to set the path through sys.path rather than s= etting > an environment variable. Isn=E2=80=99t that what =E2=80=98wrap-script=E2=80=99 does? > Now, this will create a world rebuild=E2=80=A6 What do you think? Not good! :-) This Meson issue is not a regression compared to master, is it? How about providing a user-facing =E2=80=98meson=E2=80=99 package that inco= rporates this fix, while keeping the other =E2=80=98meson=E2=80=99 packages unchanged, to= avoid rebuilding too much? This can be achieved by marking the other packages as hidden. > From 08845844e8e1a18232bf54f9f3f0b71d5e0c71ef Mon Sep 17 00:00:00 2001 > From: Vivien Kraus > Date: Thu, 18 Nov 2021 15:17:52 +0100 > Subject: [PATCH] gnu: meson: Extend the python path in the installed prog= ram. > > * gnu/packages/build-tools.scm (meson) [phase wrap]: Wrap the python path= as > python code. > --- > gnu/packages/build-tools.scm | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 849101c2a4..ef5aa4bd35 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -283,7 +283,21 @@ (define-public meson > #:phases (modify-phases %standard-phases > ;; Meson calls the various executables in out/bin thro= ugh the > ;; Python interpreter, so we cannot use the shell wrap= per. > - (delete 'wrap)))) > + (replace 'wrap > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((path (string-split (getenv "GUIX_PYTHONPATH= ") #\:))) > + (substitute* (string-append (assoc-ref outputs "= out") "/bin/meson") Could you check =E2=80=98guix gc --references meson=E2=80=99 to make sure i= t does not capture too much? (GUIX_PYTHONPATH might contain references to build-time dependencies.) I suppose GUIX_PYTHONPATH contains the package=E2=80=99s =E2=80=9Cout=E2=80= =9D, right? Thanks! Ludo=E2=80=99.