• [gentoo-dev] [PATCH] distutils-r1.eclass: Use gpep517's new prefix rewr

    From James Le Cuirot@21:1/5 to All on Wed Aug 23 22:40:01 2023
    It is okay for these to be given as an empty string.

    Signed-off-by: James Le Cuirot <chewi@gentoo.org>
    ---

    This cannot be applied until gpep517-14 is stable, but I'm just getting
    it reviewed in readiness.

    eclass/distutils-r1.eclass | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
    index 91de144e1110..34ef3b6e55f3 100644
    --- a/eclass/distutils-r1.eclass
    +++ b/eclass/distutils-r1.eclass
    @@ -210,7 +210,7 @@ _distutils_set_globals() {
    fi

    bdep='
    - >=dev-python/gpep517-13[${PYTHON_USEDEP}]
    + >=dev-python/gpep517-14[${PYTHON_USEDEP}]
    '
    case ${DISTUTILS_USE_PEP517} in
    flit)
    @@ -1452,7 +1452,11 @@ distutils_pep517_install() {
    cmd+=( --config-json "${config_settings}" )
    fi
    if [[ -n ${SYSROOT} ]]; then
    - cmd+=( --sysroot "${SYSROOT}" )
    + cmd+=(
    + --sysroot "${SYSROOT}"
    + --rewrite-prefix-from "${BROOT}"
    + --rewrite-prefix-to "${EPREFIX}"
    + )
    fi
    printf '%s\n' "${cmd[*]}"
    local wheel=$(
    --
    2.41.0

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1
  • From Benda Xu@21:1/5 to James Le Cuirot on Thu Aug 24 06:20:01 2023
    James Le Cuirot <chewi@gentoo.org> writes:

    if [[ -n ${SYSROOT} ]]; then
    - cmd+=( --sysroot "${SYSROOT}" )
    + cmd+=(
    + --sysroot "${SYSROOT}"
    + --rewrite-prefix-from "${BROOT}"
    + --rewrite-prefix-to "${EPREFIX}"
    + )
    fi

    Looks good to me. Thanks!

    Yours,
    Benda

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