public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: James Le Cuirot <chewi@gentoo.org>
Subject: Re: [gentoo-dev] [PATCH] python-utils-r1.eclass: Fix python_doheader install location with ROOT
Date: Sat, 02 Mar 2024 17:15:59 +0100	[thread overview]
Message-ID: <fe191624582836d210159236fd99f09d012f7a6a.camel@gentoo.org> (raw)
In-Reply-To: <20240302152045.28955-1-chewi@gentoo.org>

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

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


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

      reply	other threads:[~2024-03-02 16:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-02 15:20 [gentoo-dev] [PATCH] python-utils-r1.eclass: Fix python_doheader install location with ROOT James Le Cuirot
2024-03-02 16:15 ` Michał Górny [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fe191624582836d210159236fd99f09d012f7a6a.camel@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=chewi@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox