From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aMpIDBNilmFGFQEAgWs5BA (envelope-from ) for ; Thu, 18 Nov 2021 15:24:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id oD7dBxNilmHCVgAAB5/wlQ (envelope-from ) for ; Thu, 18 Nov 2021 14:24:19 +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 CCBE3205C4 for ; Thu, 18 Nov 2021 15:24:18 +0100 (CET) Received: from localhost ([::1]:52228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mniKo-0006vQ-26 for larch@yhetil.org; Thu, 18 Nov 2021 09:24:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniKY-0006v5-KC for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mniKY-0003HA-CI for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mniKY-0001MC-2Y for guix-patches@gnu.org; Thu, 18 Nov 2021 09:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51948] [PATCH] Meson needs proper wrapping Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 14:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51948@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16372454395205 (code B ref -1); Thu, 18 Nov 2021 14:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Nov 2021 14:23:59 +0000 Received: from localhost ([127.0.0.1]:35321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniKU-0001Lt-LZ for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:23:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:53878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniKT-0001Ln-Du for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:23:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniKT-0006uI-3z for guix-patches@gnu.org; Thu, 18 Nov 2021 09:23:57 -0500 Received: from [2a00:5881:4008:2810::309] (port=53408 helo=planete-kraus.eu) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1mniKQ-0003FH-Gi for guix-patches@gnu.org; Thu, 18 Nov 2021 09:23:56 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 68caf435 for ; Thu, 18 Nov 2021 14:23:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h=from :to:subject:date:message-id:mime-version:content-type; s=dkim; bh=8tvgfrHmS53oTtKKcELspQ/+0Lc=; b=Qn00iZE5POYhBVtDeI9A+MjSsxp6 m1JTMeYek62Rww7StPNIxjqPwtsiNYw9+DkbLKPNp3OY2GZ0cwIc/g+W8wA8/PWN TdqBZLK+yl6HTrkL5sp/srIyB43d04Ej4YkrMLRClxS/7gAG7LCT0cDJMIEseFbY 6OxBHAiLR6mNoHU= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id d29a7894 (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Thu, 18 Nov 2021 14:23:48 +0000 (UTC) Date: Thu, 18 Nov 2021 15:23:48 +0100 Message-ID: <87r1bda6ff.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:5881:4008:2810::309 (failed) Received-SPF: pass client-ip=2a00:5881:4008:2810::309; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, RDNS_NONE=0.793, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via 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=1637245458; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=LWBuK9g4VoP6HvcIzV6aIXacFSX/Jj0zD0Pqw/JnF80=; b=psM8MqR51dg350YEr8jceMW1wbyK1AyQyFabSULgyyuKRMQOG4xQM5IIFtPioyibm/3mGV LdEHn8bvwX+ogFkFhEFErO3+XoWKjQpDSzwcAQAMW5Z9BkfIfEJG5/7mPSWflNbAYoUB4s orYsEMbsYpgvtutgFOiCv48lAkfZroW8eqlhuepm35R88+7o32N+qhkFyam4C/fquPJi56 G0mzPhoGzqWPU9ydoHW6at9tkGdVWkhQ0alOSXw7ibiy5xYFPz5aEFTEwSVnGt+rh8O/qo As4W/m9nKoA6CTk2hToNYGIvMbOMMKnhdhD0K4twmxSq8tQXE+qeITRkjiKb0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637245458; a=rsa-sha256; cv=none; b=FR+Q2G26SiSTk6N8LkFKO9Lw/kzVCGLFeVRPn5BiJskFM4N/CDPdatCpYIe9IdTFrPHmi+ YlqKyUrYf+2oRHVFfayCWEHarJCnT6HpCQo+pDKnw8T9MEVVrkcpxJjzP/Gvg9mcw0swxi ydFLLFEWoxWty9DvU74NLcpM4iQbH3V1EFnxm08syv8ON/AI548//9uhsN0vnCwd/gogHK TpeU1cNu9OMps6XksvLWewU5IDwUSmqdJ5pmPD43Qq9bniCLWFNpopK3HyWSNv/+tiLrjB 5+PLPlxpHXuKae8Qr+oe5lAT38/yhlACje7xRYMT+1oWEnuBIyVACNxUZOCr5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=Qn00iZE5; 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: -4.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=Qn00iZE5; 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: CCBE3205C4 X-Spam-Score: -4.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: DtG/y0wMhC5l --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dear guix, 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 set= ting an environment variable. Now, this will create a world rebuild=E2=80=A6 What do you think? Vivien --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-meson-Extend-the-python-path-in-the-installed-pr.patch Content-Transfer-Encoding: quoted-printable Content-Description: Properly wrap meson From=2008845844e8e1a18232bf54f9f3f0b71d5e0c71ef 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 progra= m. * gnu/packages/build-tools.scm (meson) [phase wrap]: Wrap the python path as python code. =2D-- 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 =2D-- 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 throug= h the ;; Python interpreter, so we cannot use the shell wrappe= r. =2D (delete 'wrap)))) + (replace 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((path (string-split (getenv "GUIX_PYTHONPATH")= #\:))) + (substitute* (string-append (assoc-ref outputs "ou= t") "/bin/meson") + (("# EASY-INSTALL-ENTRY-SCRIPT") + (format #f "\ +import sys +~a +# EASY-INSTALL-ENTRY-SCRIPT" + (string-join + (map (lambda (path) + (format #f "sys.path.insert(0, = '~a')" + path)) + (reverse path)) + "\n")))))))))) (inputs `(("ninja" ,ninja))) (propagated-inputs `(("python" ,python))) (home-page "https://mesonbuild.com/") =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGWYfQACgkQO7C8EjLY uCx6RQv/dAim25a86h4Ob7Kxzu7VW8Zh5JCzGt8xEjPyerTsLw6hLxNpNRZz2V9k giTdkcGVgnrdT5vx6IceoC0yQRE2L6AteWhI9k9toxZB1AEKr0i+C2BV668ydNUk LSRAkD50gwKk+MAbgfqA0g5+hnjxQIPGyMvUX11uhKWzirEwfG+MukLOaO8BmPV2 s6HLZ9O0riXP+CZNrIcJYhk/YfVX5wFT754ps2UU4ptFwZetPSuSq1Mk0vIjeONH XCLVfu8vpxf7SnLW0Y5TclMdjtKJCP0eS2OsAyN5vfjuq+zElZXmek2eby85M0BR df5J8I+wEM6kWDiwQ6vK/MnO5mSu1LgH3RgRfR+t36wjpNUuSryeuufbQ4GGCAS3 IZcE9QlxvM55N6hj7SCUwXBASoeOkdn3YY9FeOSiVai5WikjQuMfxiWwntP/+R+L AcH+eFRf3nIqzDX6UaRR/c9Js80msPHRAJo40Lz5WAkaJFRCPiSU3aycYVlDpepO U//xlRs7 =9sky -----END PGP SIGNATURE----- --==-=-=--