From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99AB6158041 for ; Tue, 20 Feb 2024 06:28:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7190D2BC024; Tue, 20 Feb 2024 06:28:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CFF12BC017 for ; Tue, 20 Feb 2024 06:28:36 +0000 (UTC) Message-ID: Subject: Re: [gentoo-dev] [PATCH 2/3] distutils-r1.eclass: wire up meson-python to meson.eclass From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Tue, 20 Feb 2024 07:28:31 +0100 In-Reply-To: <20240220043235.3889132-3-eschwartz93@gmail.com> References: <20240220043235.3889132-1-eschwartz93@gmail.com> <20240220043235.3889132-3-eschwartz93@gmail.com> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-o5A/rjHFskJ3ea1D7aWP" User-Agent: Evolution 3.50.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: d8ef01ed-913d-4a1a-97a0-d4fd61315db4 X-Archives-Hash: 0aeefa410af4af970ca9e6620c2b0026 --=-o5A/rjHFskJ3ea1D7aWP Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2024-02-19 at 23:26 -0500, Eli Schwartz wrote: > The meson-python build backend -- as the name suggests -- uses meson > under the hood. We have a meson eclass which does lots of useful things > pertinent to meson. Make sure it gets invoked. >=20 > Signed-off-by: Eli Schwartz > --- > eclass/distutils-r1.eclass | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) >=20 > diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass > index c0d1992ccce0..35825d4c3aa6 100644 > --- a/eclass/distutils-r1.eclass > +++ b/eclass/distutils-r1.eclass > @@ -197,6 +197,10 @@ _DISTUTILS_R1_ECLASS=3D1 > inherit flag-o-matic > inherit multibuild multilib multiprocessing ninja-utils toolchain-funcs > =20 > +if [[ ${DISTUTILS_USE_PEP517} =3D meson-python ]]; then > + inherit meson > +fi > + > if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then > inherit python-r1 > else > @@ -1386,6 +1390,7 @@ distutils_pep517_install() { > ) > ;; > meson-python) > + meson_src_configure "${DISTUTILS_ARGS[@]}" NAK. You're calling configure twice, possibly with disjoint results.=20 This is bound to be a mess, as you discovered yourself. > local -x NINJAOPTS=3D$(get_NINJAOPTS) > config_settings=3D$( > "${EPYTHON}" - "${DISTUTILS_ARGS[@]}" <<-EOF || die > @@ -1397,7 +1402,6 @@ distutils_pep517_install() { > ninjaopts =3D shlex.split(os.environ["NINJAOPTS"]) > print(json.dumps({ > "builddir": "${BUILD_DIR}", > - "setup-args": sys.argv[1:], > "compile-args": ["-v"] + ninjaopts, > })) > EOF --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-o5A/rjHFskJ3ea1D7aWP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQFGBAABCgAwFiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAmXURo8SHG1nb3JueUBn ZW50b28ub3JnAAoJEGOa2uIyniQO7GQIAIGCAHPo91biBPAPMfNvelv6IX4w/OiR 5R5y3pdSl+jZo3D7Vuax+G9utN22nTrWXm5+7Fg0iEIZ+kJNpE9GDN/IL9tXkLSu /JJtTV3UJ0keGje/0WWCc+IcZNqjlCrnbHo1nHheuMzCLYF0CHx64HamwxLJShAZ rKQiZP/zOes5cH10wj47PyaFbERzjiIlsRMviKenSlGKJIhqoC7+DRI7Y4AmEMBC JXjjnNQjmv3xQALsxSmPXCpJ62SR6m4MXDc1ewuN2taTfkxqnJOnhuTNDlbFawZL ErgkLykka2TQVLWtFgOG8XHPv+QWifzYp97gG7LqbiGXXdlKYRNoMSs= =nchA -----END PGP SIGNATURE----- --=-o5A/rjHFskJ3ea1D7aWP--