diff options
Diffstat (limited to 'meta/classes/python_pep517.bbclass')
| -rw-r--r-- | meta/classes/python_pep517.bbclass | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/meta/classes/python_pep517.bbclass b/meta/classes/python_pep517.bbclass index 756333bcf28..82574df61cb 100644 --- a/meta/classes/python_pep517.bbclass +++ b/meta/classes/python_pep517.bbclass @@ -1,7 +1,7 @@ # Common infrastructure for Python packages that use PEP-517 compliant packaging. # https://www.python.org/dev/peps/pep-0517/ -DEPENDS:append = " python3-pip-native" +DEPENDS:append = " python3-installer-native" # Where to execute the build process from PEP517_SOURCE_PATH ?= "${S}" @@ -11,18 +11,10 @@ PEP517_SOURCE_PATH ?= "${S}" # a recipe wants to install prebuilt wheels. PEP517_WHEEL_PATH ?= "${WORKDIR}/dist" -PIP_INSTALL_ARGS = "\ - -vvvv \ - --ignore-installed \ - --no-cache \ - --no-deps \ - --no-index \ - --root=${D} \ - --prefix=${prefix} \ -" +PEP517_INSTALL_PYTHON = "${bindir}/python3" +PEP517_INSTALL_PYTHON:class-native = "${STAGING_BINDIR_NATIVE}/nativepython3" -PEP517_INSTALL_PYTHON = "python3" -PEP517_INSTALL_PYTHON:class-native = "nativepython3" +INSTALL_WHEEL_COMPILE_BYTECODE ?= "--compile-bytecode=0" python_pep517_do_install () { COUNT=$(find ${PEP517_WHEEL_PATH} -name '*.whl' | wc -l) @@ -32,18 +24,7 @@ python_pep517_do_install () { bbfatal More than one wheel found in ${PEP517_WHEEL_PATH}, this should not happen fi - nativepython3 -m pip install ${PIP_INSTALL_ARGS} ${PEP517_WHEEL_PATH}/*.whl - - cd ${D} - for i in ${D}${bindir}/* ${D}${sbindir}/*; do - if [ -f "$i" ]; then - sed -i -e "1s,#!.*nativepython3,#!${USRBINPATH}/env ${PEP517_INSTALL_PYTHON}," $i - sed -i -e "s:${PYTHON}:${USRBINPATH}/env\ ${PEP517_INSTALL_PYTHON}:g" $i - sed -i -e "s:${STAGING_BINDIR_NATIVE}:${bindir}:g" $i - # Not everything we find may be Python, so ignore errors - nativepython3 -mpy_compile $(realpath --relative-to=${D} $i) || true - fi - done + nativepython3 -m installer ${INSTALL_WHEEL_COMPILE_BYTECODE} --interpreter ${PEP517_INSTALL_PYTHON} --destdir=${D} ${PEP517_WHEEL_PATH}/*.whl } # A manual do_install that just uses unzip for bootstrapping purposes. Callers should DEPEND on unzip-native. |