mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 00:32:12 +02:00
setuptools3.bbclass: clean up
There's been a lot of work in this class lately, so a little spring
cleaning is needed.
Create wheels verbosely to help debug problems.
Remove unused SETUPTOOLS_INSTALL_ARGS, these can't be passed to
bdist_wheel.
Remove duplicate manipulation of files in bindir as pip_install_wheel
does the same.
Remove obsolete deletion of easy-install.pth, wheels don't generate that.
Remove obsolete ${datadir}/share fixup, pip-installed wheels can't
generate that path combination.
Remove purging of ${D} references from *.py, these won't be written by
standard setuptools, and recipes can do it themselves to work around
specific issues if needed.
Remove obsolete vardepsexclude of MACHINE on do_install, as that variable
isn't referenced.
(From OE-Core rev: 57c477ca13e352b6f9b21385abbfaad9778c6398)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b678b7f0a0
commit
2552f836c9
@@ -4,13 +4,6 @@ inherit setuptools3-base pip_install_wheel
|
||||
#B = "${WORKDIR}/build"
|
||||
|
||||
SETUPTOOLS_BUILD_ARGS ?= ""
|
||||
SETUPTOOLS_INSTALL_ARGS ?= "--root=${D} \
|
||||
--prefix=${prefix} \
|
||||
--install-lib=${PYTHON_SITEPACKAGES_DIR} \
|
||||
--install-data=${datadir}"
|
||||
|
||||
SETUPTOOLS_PYTHON = "python3"
|
||||
SETUPTOOLS_PYTHON:class-native = "nativepython3"
|
||||
|
||||
SETUPTOOLS_SETUP_PATH ?= "${S}"
|
||||
|
||||
@@ -24,42 +17,17 @@ setuptools3_do_compile() {
|
||||
STAGING_INCDIR=${STAGING_INCDIR} \
|
||||
STAGING_LIBDIR=${STAGING_LIBDIR} \
|
||||
${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
|
||||
bdist_wheel ${SETUPTOOLS_BUILD_ARGS} || \
|
||||
bdist_wheel --verbose ${SETUPTOOLS_BUILD_ARGS} || \
|
||||
bbfatal_log "'${PYTHON_PN} setup.py bdist_wheel ${SETUPTOOLS_BUILD_ARGS}' execution failed."
|
||||
}
|
||||
setuptools3_do_compile[vardepsexclude] = "MACHINE"
|
||||
do_compile[cleandirs] += "${SETUPTOOLS_SETUP_PATH}/dist"
|
||||
|
||||
setuptools3_do_install() {
|
||||
cd ${SETUPTOOLS_SETUP_PATH}
|
||||
|
||||
pip_install_wheel_do_install
|
||||
|
||||
# support filenames with *spaces*
|
||||
find ${D} -name "*.py" -exec grep -q ${D} {} \; \
|
||||
-exec sed -i -e s:${D}::g {} \;
|
||||
|
||||
for i in ${D}${bindir}/* ${D}${sbindir}/*; do
|
||||
if [ -f "$i" ]; then
|
||||
sed -i -e s:${PYTHON}:${USRBINPATH}/env\ ${SETUPTOOLS_PYTHON}:g $i
|
||||
sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g $i
|
||||
fi
|
||||
done
|
||||
|
||||
rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/easy-install.pth
|
||||
|
||||
#
|
||||
# FIXME: Bandaid against wrong datadir computation
|
||||
#
|
||||
if [ -e ${D}${datadir}/share ]; then
|
||||
mv -f ${D}${datadir}/share/* ${D}${datadir}/
|
||||
rmdir ${D}${datadir}/share
|
||||
fi
|
||||
}
|
||||
setuptools3_do_install[vardepsexclude] = "MACHINE"
|
||||
|
||||
EXPORT_FUNCTIONS do_configure do_compile do_install
|
||||
|
||||
export LDSHARED="${CCLD} -shared"
|
||||
DEPENDS += "python3-setuptools-native python3-wheel-native"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user