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 9F38C158041 for ; Sat, 2 Mar 2024 16:16:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C3F2E29CE; Sat, 2 Mar 2024 16:16:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6DB4E29C4 for ; Sat, 2 Mar 2024 16:16:04 +0000 (UTC) Message-ID: Subject: Re: [gentoo-dev] [PATCH] python-utils-r1.eclass: Fix python_doheader install location with ROOT From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: James Le Cuirot Date: Sat, 02 Mar 2024 17:15:59 +0100 In-Reply-To: <20240302152045.28955-1-chewi@gentoo.org> References: <20240302152045.28955-1-chewi@gentoo.org> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-A/Brxdsrp6aZLk8zkiK/" 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: 9aa8f175-4820-440b-8ab0-583747759510 X-Archives-Hash: be947adf4288d40336b8baa22277e453 --=-A/Brxdsrp6aZLk8zkiK/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 2024-03-02 at 15:20 +0000, James Le Cuirot wrote: > python_get_includedir is prefixed with ESYSROOT, not EPREFIX, so we need > to strip off the former, not the latter. >=20 > This is currently only used for dev-python/pillow, which I have tested. >=20 > Signed-off-by: James Le Cuirot > --- > eclass/python-utils-r1.eclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclas= s > index 3af3cbdb075e1..caa39813feec7 100644 > --- a/eclass/python-utils-r1.eclass > +++ b/eclass/python-utils-r1.eclass > @@ -884,7 +884,7 @@ python_doheader() { > [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null)= .' > =20 > local includedir=3D$(python_get_includedir) > - local d=3D${includedir#${EPREFIX}} > + local d=3D${includedir#${ESYSROOT}} > =20 > ( > insopts -m 0644 Good catch, thanks! I'll add it onto https://github.com/gentoo/gentoo/pull/35554 to avoid double cache regen. --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-A/Brxdsrp6aZLk8zkiK/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQFGBAABCgAwFiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAmXjUL8SHG1nb3JueUBn ZW50b28ub3JnAAoJEGOa2uIyniQOhikH/3B1eFqWTqeyP+LFp0KtVJ1k6TgKcvb2 8RWT1QUd098FtVvnuwKIhQe/vxgDh9hRNV8NQ9reHm8vkoIe9QoHgKYvg+IAa3xH C4bQXLbm1dAjQQNx2uPodC4+kMbUwPBGhJb487hZenMZi8ptPizJTR5Wz70Sz6Hh DWfK591z0tpoE61/PWDed/ECyh+5+EiyBuuyy5/nEuPqLlgSCNky70Xr2JcC1gvp 4McdErthI4aJlKQLaVspkGiYYLa81S4pht+0u0ixWr8SkFnF1JPW09kdNKOGRJGw glgcgwGqMObsGDl2a2SICMmWBTxWhSygx13QGjN/yQaHuWApO9dXpDQ= =KrWg -----END PGP SIGNATURE----- --=-A/Brxdsrp6aZLk8zkiK/--