From 5a0e6df4e6886fe7542bdacbe28885ae74dd6c51 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Mon, 2 Dec 2024 02:48:34 +0000 Subject: [PATCH] wheel.mk: Add meson wheel compiling ability --- mk/crossenv/requirements-default.txt | 4 ++-- mk/spksrc.wheel.mk | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mk/crossenv/requirements-default.txt b/mk/crossenv/requirements-default.txt index 0946ba23703..9400a96724e 100644 --- a/mk/crossenv/requirements-default.txt +++ b/mk/crossenv/requirements-default.txt @@ -9,11 +9,11 @@ cryptography==43.0.3 Cython==3.0.11 flit==3.10.1 maturin==1.7.4 -#meson-python==0.17.1 +meson-python==0.17.1 msgpack==1.0.5 poetry==1.8.4 scikit-build==0.18.1 -#scikit-build-core==0.10.7 +scikit-build-core==0.10.7 setuptools-rust==1.10.2 setuptools-scm==8.1.0 typing_extensions==4.12.2 diff --git a/mk/spksrc.wheel.mk b/mk/spksrc.wheel.mk index 937470e1e13..2ef95acdecb 100644 --- a/mk/spksrc.wheel.mk +++ b/mk/spksrc.wheel.mk @@ -20,6 +20,12 @@ include ../../mk/spksrc.wheel-env.mk ## python wheel specific configurations include ../../mk/spksrc.crossenv.mk +## meson specific configurations +include ../../mk/spksrc.cross-cmake-env.mk + +## meson specific configurations +include ../../mk/spksrc.cross-meson-env.mk + ## ifeq ($(strip $(PRE_WHEEL_TARGET)),) @@ -215,6 +221,7 @@ cross-compile-wheel-%: fi ; \ $(MSG) \ _PYTHON_HOST_PLATFORM="$(TC_TARGET)" \ + MESON_CROSS_FILE="$(MESON_TOOLCHAIN_WRK)" \ $(PIP_CROSSENV) \ $(PIP_WHEEL_ARGS_CROSSENV) \ $${pip_global_option} \ @@ -223,6 +230,7 @@ cross-compile-wheel-%: $(REQUIREMENT) ; \ $(RUN) \ _PYTHON_HOST_PLATFORM="$(TC_TARGET)" \ + MESON_CROSS_FILE="$(MESON_TOOLCHAIN_WRK)" \ $(PIP_CROSSENV) \ $(PIP_WHEEL_ARGS_CROSSENV) \ $${pip_global_option} \