From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euMZn-0001bb-9p for guix-patches@gnu.org; Fri, 09 Mar 2018 13:17:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euMZj-0005wb-5B for guix-patches@gnu.org; Fri, 09 Mar 2018 13:17:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1euMZi-0005wS-Un for guix-patches@gnu.org; Fri, 09 Mar 2018 13:17:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1euMZi-0005Rm-Fr for guix-patches@gnu.org; Fri, 09 Mar 2018 13:17:02 -0500 Subject: [bug#30761] [PATCH staging 1/9] gnu: meson: Don't wrap the meson executable. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180309181108.22888-1-mbakke@fastmail.com> References: <20180309181108.22888-1-mbakke@fastmail.com> Date: Fri, 09 Mar 2018 19:16:21 +0100 Message-ID: <87lgf115e2.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30761@debbugs.gnu.org --=-=-= Content-Type: text/plain Marius Bakke writes: > * gnu/packages/build-tools.scm (meson)[arguments]: Delete WRAP-PHASE. > --- > gnu/packages/build-tools.scm | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 2abb44fdb..1ebccca43 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -81,6 +81,11 @@ makes a few sacrifices to acquire fast full and incremental build times.") > (base32 > "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah")))) > (build-system python-build-system) > + (arguments > + `(#:phases (modify-phases %standard-phases > + ;; Meson runs itself through the Python interpreter, so > + ;; we cannot use the shell wrapper. > + (delete 'wrap)))) It may be better to do this in 'meson-for-build' only, so that things like "meson --help" works out of the box for the "normal" meson. This is likely the reason 'meson-for-build' got "stuck" on version 0.42. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqiz3UACgkQoqBt8qM6 VPpHzQf/cB1JBIurUKy7uRTEYhG+aLibk9YPdj07tL5IfvihznehD9vBSNN275J8 /X4chy6JYv2f/9jeyqUJwYJRIWV3YLqHAh29HlLeO1TBTusU4hyigAIjiIPG7im9 /5lfJM8mhxSszh6TalAXguxPyEKvazaavq3H4oi6xD/lTXGptaKgGGke9b9dCx7u TEzb6nTWzyYhXoezlz7iH46WGRy7OZm2eRmASvqJihI8FraOzSxNZHFIRpgD2K0B ajWu0yLyQamd3uGhvhoq9gMJ9kEytK7gwkOModhYCQ8Gy9yqKh6Suypzd/iqC+lz BkRMHDu3aEzRv0Uf+G47KGMica7gaw== =+V59 -----END PGP SIGNATURE----- --=-=-=--