1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH] python-utils-r1.eclass: Fix python_doheader instal

    From James Le Cuirot@21:1/5 to All on Sat Mar 2 16:30:01 2024
    python_get_includedir is prefixed with ESYSROOT, not EPREFIX, so we need
    to strip off the former, not the latter.

    This is currently only used for dev-python/pillow, which I have tested.

    Signed-off-by: James Le Cuirot <chewi@gentoo.org>
    ---
    eclass/python-utils-r1.eclass | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass 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).'

    local includedir=$(python_get_includedir)
    - local d=${includedir#${EPREFIX}}
    + local d=${includedir#${ESYSROOT}}

    (
    insopts -m 0644
    --
    2.43.2

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?=@21:1/5 to James Le Cuirot on Sat Mar 2 17:20:02 2024
    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.

    This is currently only used for dev-python/pillow, which I have tested.

    Signed-off-by: James Le Cuirot <chewi@gentoo.org>
    ---
    eclass/python-utils-r1.eclass | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass 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).'

    local includedir=$(python_get_includedir)
    - local d=${includedir#${EPREFIX}}
    + local d=${includedir#${ESYSROOT}}

    (
    insopts -m 0644

    Good catch, thanks! I'll add it onto https://github.com/gentoo/gentoo/pull/35554 to avoid double cache regen.

    --
    Best regards,
    Michał Górny


    -----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-----

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)