Try passing meson arguments

mreid-tt · Feb 16, 2025 · 1b46fe4 · 1b46fe4
1 parent 970ca0b
commit 1b46fe4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/mk/spksrc.wheel-compile.mk b/mk/spksrc.wheel-compile.mk
@@ -118,8 +118,12 @@ cross-compile-wheel-%:
 	   exit 2 ; \
 	fi ; \
 	if [ "$(PIP_GLOBAL_OPTION)" ]; then \
-	   pip_global_option=$$(echo $(PIP_GLOBAL_OPTION) | sed 's/=\([^ ]*\)/="\1"/g; s/[^ ]*/--global-option=&/g') ; \
-	   pip_global_option=$${pip_global_option}" --no-use-pep517" ; \
+	   if echo "$(PIP_GLOBAL_OPTION)" | grep -q -- "--config-settings"; then \
+	      pip_global_option=$$(echo $(PIP_GLOBAL_OPTION) | sed 's/--config-settings=\([^ ]*\)/\1/g; s/=\([^ ]*\)/="\1"/g; s/[^ ]*/--config-settings=&/g') ; \
+	   else \
+	      pip_global_option=$$(echo $(PIP_GLOBAL_OPTION) | sed 's/=\([^ ]*\)/="\1"/g; s/[^ ]*/--global-option=&/g') ; \
+	      pip_global_option=$${pip_global_option}" --no-use-pep517" ; \
+	   fi ; \
 	fi ; \
 	$(MSG) \
 	   _PYTHON_HOST_PLATFORM=\"$(TC_TARGET)\" \

diff --git a/spk/duplicity/Makefile b/spk/duplicity/Makefile
@@ -34,6 +34,12 @@ SPK_USR_LOCAL_LINKS += bin:bin/duply
 
 include ../../mk/spksrc.python.mk
 
+# [duplicity]
+ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS) $(ARMv8_ARCHS) qoriq),$(ARCH))
+WHEELS_BUILD_ARGS = [duplicity]
+WHEELS_BUILD_ARGS += --config-settings=setup-args="-Dimplicit_include_directories=false"
+endif
+
 # [cryptography]
 DEPENDS += cross/cryptography