]> code.ossystems Code Review - openembedded-core.git/commitdiff
setuptools3: respect PIP_INSTALL_DIST_PATH
authorRoss Burton <ross@burtonini.com>
Tue, 8 Mar 2022 14:30:31 +0000 (14:30 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Mar 2022 11:46:23 +0000 (11:46 +0000)
pip_install_wheel expects the wheels to be in PIP_INSTALL_DIST_PATH but
this class was writing to the same directory through chance not design.

Respect PIP_INSTALL_DIST_PATH as the output directory.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/setuptools3.bbclass

index 1b1a8aac76d006a3b74d7a9f0661c2104f93f3f9..dcf3561b8d50ab537aec7e37e36068ec89e631b6 100644 (file)
@@ -17,11 +17,11 @@ setuptools3_do_compile() {
         STAGING_INCDIR=${STAGING_INCDIR} \
         STAGING_LIBDIR=${STAGING_LIBDIR} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
-        bdist_wheel --verbose ${SETUPTOOLS_BUILD_ARGS} || \
+        bdist_wheel --verbose --dist-dir ${PIP_INSTALL_DIST_PATH} ${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"
+do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}"
 
 setuptools3_do_install() {
         pip_install_wheel_do_install