From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ELAtDQ8omGG7LgAAgWs5BA (envelope-from ) for ; Fri, 19 Nov 2021 23:41:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aOS1Bw8omGH/VwAAbx9fmQ (envelope-from ) for ; Fri, 19 Nov 2021 22:41: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 8B1C3F8BA for ; Fri, 19 Nov 2021 23:41:14 +0100 (CET) Received: from localhost ([::1]:58320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moCZF-0006C0-Lr for larch@yhetil.org; Fri, 19 Nov 2021 17:41:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moCZ4-0006BY-Rl for guix-patches@gnu.org; Fri, 19 Nov 2021 17:41:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moCZ4-0003pm-K6 for guix-patches@gnu.org; Fri, 19 Nov 2021 17:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moCZ4-0006B3-FO for guix-patches@gnu.org; Fri, 19 Nov 2021 17:41: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: Fri, 19 Nov 2021 22:41:02 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 51948@debbugs.gnu.org Received: via spool by 51948-submit@debbugs.gnu.org id=B51948.163736164323709 (code B ref 51948); Fri, 19 Nov 2021 22:41:02 +0000 Received: (at 51948) by debbugs.gnu.org; 19 Nov 2021 22:40:43 +0000 Received: from localhost ([127.0.0.1]:40741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moCYl-0006AL-E1 for submit@debbugs.gnu.org; Fri, 19 Nov 2021 17:40:43 -0500 Received: from planete-kraus.eu ([89.234.140.182]:57540) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moCYj-0006A9-EN for 51948@debbugs.gnu.org; Fri, 19 Nov 2021 17:40:42 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 080a6269; Fri, 19 Nov 2021 22:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:date:in-reply-to:message-id :mime-version:content-type; s=dkim; bh=zL7QAf8jEX9TBGbHUwk2n7kqA a0=; b=tCHIMn9jex08MZptH0x1HVDZ5mFDJoXixmyZB96WhaNxyvO1fqlkol1F0 SGE05Ryq151PArAaGN2t1V01kDNaOwy9HwMUb1ic3FetJtpqMelp7xnt2fmfWPFo uhbo1HGCEOC+NVbYYkTyaXj+xULpvlmk2PsqXR7fS+RdMrSpLQ= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id e86cd1ee (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Fri, 19 Nov 2021 22:40:36 +0000 (UTC) References: <87r1bda6ff.fsf@planete-kraus.eu> <8735nsmgqc.fsf@gnu.org> <877dd49rnn.fsf@planete-kraus.eu> <87zgpzhjta.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 Date: Fri, 19 Nov 2021 23:34:19 +0100 In-reply-to: <87zgpzhjta.fsf@gnu.org> Message-ID: <8735nrahwc.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637361674; 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: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=MJo8f6mZDDgrxkJGCv8pxM+oCC8p+x99hropxi9EgDY=; b=KjdClV69OYcjK9J/mRQn2ZfK2XqTAQjj5zY/D6weR6CpD86N7Y93WcTgRuv6IhTzH/0MZ1 Cp2kFVVooBZAcwhqf93EuMJQNY6s9ZCG1m8omT/vw0o6G5GQe2qMq/8hdbUAFNVi4uqfNl XcVkI6DSPi3XiwZJSaTCENe5UUuRFc9h3aH1tUlak9SxdrAE3iJjXmcmXySBVYOI+FdXSv zOH7B87wu9uS2HR3AIPB6NLNhtnKVOohwNdszgvSFxX44d8Z3lXVRxXA8bWyaMtJWOh967 vdmYNnpHGyE+SkzMm7G0UBgHSvO7/a0z1wuMvQzJBSED3E3jasAM04D48Cz//g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637361674; a=rsa-sha256; cv=none; b=JFjl5zQdROGjk1jZvE4wCKzNpm58GhjHKps6FQst+iuNrzGnq86KKbJoki1IhF1uESLdTk XJYky6sQSCIlM4Nh7XF0TXvDujTwRBCRvmf0g0gXVCWixXaPpaWfnbrL1hts0Zh6wP0yDU sXwaWDY0EGTwePtId1QI4A/8qcsnpHHYvtvJLhE1xOJDQsRcIBQN7dwEcs3EeABx0uPNpV Y/gO9zl4GFbrKvDv9UTEZFfASELmjSj1Xf+fX2PQHag0rGraMzArxQVlVkm3N9Fl/PzemF q5BTykNLI2lpz9L5NZpOUyxfwwQU4n1VL1VnkWAuI35TyNIAStaNfqvu73j+Yg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=tCHIMn9j; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -5.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=planete-kraus.eu header.s=dkim header.b=tCHIMn9j; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8B1C3F8BA X-Spam-Score: -5.47 X-Migadu-Scanner: scn1.migadu.com X-TUID: 9Eol5HNi1tKH --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: >> I pushed an update that does precisely that. Is the name "meson-wrapped" >> OK? Also, how can I influence guix to rather install the wrapped version >> when the user invokes "guix install meson"? > > I you just add another meson@0.60 package like this patch does, the UI > will complain that =E2=80=9Cmeson@0.60=E2=80=9D is ambiguous, that there = are two of them. > > To work around it, I=E2=80=99d mark the unwrapped meson@0.60 as hidden (u= sing > the =E2=80=98properties=E2=80=99 field) while keeping the other one visib= le. > > That way =E2=80=9Cguix install meson=E2=80=9D will install the wrapped on= e. I think that=E2=80=99s good: I build it with guix shell meson or guix build meson, and I can run its absolute file name in a guix shell --pure gcc. However, it does not seem to cause a world rebuild. 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: Meson is now hidden, the wrapped version is not From=203f77d8d5c652725411a21434443cbf2a2d135575 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-wrapped): New variable. =2D-- gnu/packages/build-tools.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 849101c2a4..6a8a9c6f66 100644 =2D-- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -287,6 +287,7 @@ (define-public meson (inputs `(("ninja" ,ninja))) (propagated-inputs `(("python" ,python))) (home-page "https://mesonbuild.com/") + (properties '((hidden? . #t))) (synopsis "Build system designed to be fast and user-friendly") (description "The Meson build system is focused on user-friendliness and speed. @@ -297,6 +298,29 @@ (define-public meson resembles Python.") (license license:asl2.0))) =20 +(define-public meson-wrapped + (package/inherit meson + (arguments + `(;; FIXME: Tests require many additional inputs and patching many + ;; hard-coded file system locations in "run_unittests.py". + #:tests? #f + #: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. + (replace 'wrap + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((python-version + (python-version (assoc-ref inputs "python"))) + (output (assoc-ref outputs "out"))) + (substitute* (string-append output "/bin/meson") + (("# EASY-INSTALL-ENTRY-SCRIPT") + (format #f "\ +import sys +sys.path.insert(0, '~a/lib/python~a/site-packages') +# EASY-INSTALL-ENTRY-SCRIPT" + output python-version))))))))) + (properties '()))) + ;;; This older Meson variant is kept for now for gtkmm and others that may ;;; have problems with 0.60. (define-public meson-0.59 =2D-=20 2.34.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAEBCAAdFiEEq4yIHjMvkliPpwQnO7C8EjLYuCwFAmGYJ+MACgkQO7C8EjLY uCxKbwv8DT8JsMpOEENYRVL5YMNfEjoXTzCE3EVLlznDcanCeh/KmixaaaiWdvsl ewKUdsxwds0Hod9NL8U/bG8sSeT24cFz2Q/lTqIzekOK78NmhcKHvjatwLKPSgBo W9yeDQ/HPK1puCTd1bGK9Aq9YGfKQmFX6ggoOb5oNWX+eFRfOLZ9hygui7+Lhl+v Ayx3EzzcLR9nK10cA5DczWyh4PwWGBOzmN+BEJSywkCQrFMKYBxLE04LY4pT1CJc OgWUEO+rVK8Viap/N6KvOdfqA5V9T5L9QL28UOr+xhiKevYBnPS7JRC47iRZoU36 DFYh7zRW0GNUhtogShc/dUU63N+a7Y6BiCen8PSFmMAEBLDJzGPeL3+FM59OO0Gf 5WUZ/iTnpajvA8i33NCccIxcOVQUtfOjMrNTM5LZse9cw5u8dLQAv2mvSBkbWRXU ZXs8zz7uWRE5KvTq0lNSgDvKXQqEFJNlr7p20c9zBqqs4jcZbhfkukUownWyb/oI rpCRvUme =OJg8 -----END PGP SIGNATURE----- --==-=-=--