eclass/python-utils-r1: Sync with Gentoo

It's from Gentoo commit 93a87f4f59eb62356f2d2cc45c6cb252cf865e11.
This commit is contained in:
Flatcar Buildbot 2023-09-25 07:13:54 +00:00 committed by Krzesimir Nowak
parent 6cc8b6c297
commit 218d629e4a

View File

@ -346,24 +346,22 @@ _python_export() {
PYTHON_SITEDIR) PYTHON_SITEDIR)
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
PYTHON_SITEDIR=$( PYTHON_SITEDIR=$(
"${PYTHON}" - <<-EOF || die "${PYTHON}" - "${EPREFIX}/usr" <<-EOF || die
import sysconfig import sys, sysconfig
print(sysconfig.get_path("purelib")) print(sysconfig.get_path("purelib", vars={"base": sys.argv[1]}))
EOF EOF
) )
PYTHON_SITEDIR=${EPREFIX}${PYTHON_SITEDIR#"${BROOT-${EPREFIX}}"}
export PYTHON_SITEDIR export PYTHON_SITEDIR
debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
;; ;;
PYTHON_INCLUDEDIR) PYTHON_INCLUDEDIR)
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" [[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
PYTHON_INCLUDEDIR=$( PYTHON_INCLUDEDIR=$(
"${PYTHON}" - <<-EOF || die "${PYTHON}" - "${ESYSROOT}/usr" <<-EOF || die
import sysconfig import sys, sysconfig
print(sysconfig.get_path("platinclude")) print(sysconfig.get_path("platinclude", vars={"installed_platbase": sys.argv[1]}))
EOF EOF
) )
PYTHON_INCLUDEDIR=${ESYSROOT}${PYTHON_INCLUDEDIR#"${BROOT-${EPREFIX}}"}
export PYTHON_INCLUDEDIR export PYTHON_INCLUDEDIR
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}" debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
@ -1244,10 +1242,6 @@ _python_check_EPYTHON() {
_python_check_occluded_packages() { _python_check_occluded_packages() {
debug-print-function ${FUNCNAME} "${@}" debug-print-function ${FUNCNAME} "${@}"
# DO NOT ENABLE THIS unless you're going to check for false
# positives before filing bugs.
[[ ! ${PYTHON_EXPERIMENTAL_QA} ]] && return
[[ -z ${BUILD_DIR} || ! -d ${BUILD_DIR}/install ]] && return [[ -z ${BUILD_DIR} || ! -d ${BUILD_DIR}/install ]] && return
local sitedir="${BUILD_DIR}/install$(python_get_sitedir)" local sitedir="${BUILD_DIR}/install$(python_get_sitedir)"