Mailing List Archive

[PATCH] python-utils-r1.eclass: Fix python_doheader install location with ROOT
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
Re: [PATCH] python-utils-r1.eclass: Fix python_doheader install location with ROOT [ In reply to ]
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