From a3d9eb8051bc2effb8130b1743ba251c1fe7c525 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Mar 2022 14:30:30 +0000 Subject: [PATCH] flit_core: 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, and use [cleandirs] to ensure that it exists and is empty. Also call the flit_core.wheel module directly as this is a public entry point to the wheel building logic. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/flit_core.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/flit_core.bbclass b/meta/classes/flit_core.bbclass index a7667795fe..3481bb5089 100644 --- a/meta/classes/flit_core.bbclass +++ b/meta/classes/flit_core.bbclass @@ -8,8 +8,8 @@ flit_core_do_configure () { # TODO: ideally this uses pypa/build flit_core_do_compile () { - mkdir -p ${S}/dist - nativepython3 -c "from flit_core import buildapi; buildapi.build_wheel('./dist')" + nativepython3 -mflit_core.wheel --outdir ${PIP_INSTALL_DIST_PATH} } +do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" EXPORT_FUNCTIONS do_configure do_compile -- 2.40.1