From ea6c0faba3b0b00916dd74d4232eb4c92a1f0ff8 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Mar 2022 14:30:31 +0000 Subject: setuptools3: respect PIP_INSTALL_DIST_PATH 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. (From OE-Core rev: 12857a77ad424c3c3cbc37275374a603e528d9f1) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/setuptools3.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/setuptools3.bbclass b/meta/classes/setuptools3.bbclass index 1b1a8aac76..dcf3561b8d 100644 --- a/meta/classes/setuptools3.bbclass +++ b/meta/classes/setuptools3.bbclass @@ -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 -- cgit v1.2.3-54-g00ecf