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 64512158041 for ; Tue, 20 Feb 2024 04:42:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A84C52BC019; Tue, 20 Feb 2024 04:42:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5CA032BC015 for ; Tue, 20 Feb 2024 04:42:36 +0000 (UTC) References: <20240220043235.3889132-1-eschwartz93@gmail.com> <20240220043235.3889132-3-eschwartz93@gmail.com> User-agent: mu4e 1.10.8; emacs 30.0.50 From: Sam James To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] [PATCH 2/3] distutils-r1.eclass: wire up meson-python to meson.eclass Date: Tue, 20 Feb 2024 04:42:03 +0000 Organization: Gentoo In-reply-to: <20240220043235.3889132-3-eschwartz93@gmail.com> Message-ID: <878r3flpaf.fsf@gentoo.org> 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 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Archives-Salt: 4632e656-bcf4-4619-a319-2d1d3c9e61fa X-Archives-Hash: c5914af89487639dd4fa0c46a9e35e3c --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Eli Schwartz writes: > 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. > Maybe check a sample (or ideally all) of the meson-python reverse dependencies? > Signed-off-by: Eli Schwartz > --- > eclass/distutils-r1.eclass | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > 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=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[@]}" > 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iOUEARYKAI0WIQQlpruI3Zt2TGtVQcJzhAn1IN+RkAUCZdQtuF8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0MjVB NkJCODhERDlCNzY0QzZCNTU0MUMyNzM4NDA5RjUyMERGOTE5MA8cc2FtQGdlbnRv by5vcmcACgkQc4QJ9SDfkZA47gD/eU9wObuXO7tOOfmxzQTgyL6cD/TF7eTbyHxJ Qk35LzoA+wYn1UZqYN5pdKNo1ppANoGOiRfuLTOaBqbJ6l8CMSkJ =tye1 -----END PGP SIGNATURE----- --=-=-=--