[2/2] pip_install_wheel: generate the wheels in directory we control outside of S

Message ID 20220308193128.1036345-2-ross.burton@arm.com
State Accepted, archived
Commit 8e7ae4246aa8dedd8a128c34450d4c1f60e2224a
Headers show
Series [1/2] python3-scons: remove PIP_INSTALL_DIST_PATH | expand

Commit Message

Ross Burton March 8, 2022, 7:31 p.m. UTC
Set the wheel distribution location, PIP_INSTALL_DIST_PATH, to a
directory under WORKDIR to enhance out-of-tree builds.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes/pip_install_wheel.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/classes/pip_install_wheel.bbclass b/meta/classes/pip_install_wheel.bbclass
index febcc8e445..954a6b750f 100644
--- a/meta/classes/pip_install_wheel.bbclass
+++ b/meta/classes/pip_install_wheel.bbclass
@@ -7,7 +7,12 @@  def guess_pip_install_package_name(d):
     return name.replace('-', '_')
 
 PIP_INSTALL_PACKAGE ?= "${@guess_pip_install_package_name(d)}"
-PIP_INSTALL_DIST_PATH ?= "${@d.getVar('SETUPTOOLS_SETUP_PATH') or d.getVar('B')}/dist"
+
+# The directory where wheels should be written too. Build classes
+# will ideally [cleandirs] this but we don't do that here in case
+# a recipe wants to install prebuilt wheels.
+PIP_INSTALL_DIST_PATH ?= "${WORKDIR}/dist"
+
 PYPA_WHEEL ??= "${PIP_INSTALL_DIST_PATH}/${PIP_INSTALL_PACKAGE}-*-*.whl"
 
 PIP_INSTALL_ARGS = "\