From e1075dce764604f0ba4028a5a7e0a221cbe4f0ac Mon Sep 17 00:00:00 2001 From: John Zhou Date: Sun, 4 May 2025 14:47:01 -0500 Subject: [PATCH 1/2] fix modulemap order --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3796f84..ee64afc 100644 --- a/Makefile +++ b/Makefile @@ -444,7 +444,7 @@ else # The non-macOS frameworks don't use the versioning structure. PYTHON_INSTALL-$(sdk)=$(PROJECT_DIR)/install/$(os)/$(sdk)/python-$(PYTHON_VERSION) -PYTHON_MODULEMAP-$(sdk)=$$(PYTHON_INCLUDE-$(sdk))/module.modulemap +PYTHON_MODULEMAP-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER)/module.modulemap PYTHON_FRAMEWORK-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/Python.framework PYTHON_LIB-$(sdk)=$$(PYTHON_FRAMEWORK-$(sdk))/Python PYTHON_BIN-$(sdk)=$$(PYTHON_INSTALL-$(sdk))/bin @@ -475,8 +475,12 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk)) # Copy headers as-is from the first target in the $(sdk) SDK cp -r $$(PYTHON_INCLUDE-$$(firstword $$(SDK_TARGETS-$(sdk)))) $$(PYTHON_INCLUDE-$(sdk)) + # Link the PYTHONHOME version of the headers + mkdir -p $$(PYTHON_INSTALL-$(sdk))/include + ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER) + # Create the modulemap file - cp -r patch/Python/module.modulemap.prefix $$(PYTHON_MODULEMAP-$(sdk)) + cp -r patch/Python/module.modulemap.prefix $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER) echo "" >> $$(PYTHON_MODULEMAP-$(sdk)) cd $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Include && \ find cpython -name "*.h" | sort | sed -e 's/^/ exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-$(sdk)) && \ @@ -484,10 +488,6 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk)) find internal -name "*.h" | sort | sed -e 's/^/ exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-$(sdk)) echo "\n}" >> $$(PYTHON_MODULEMAP-$(sdk)) - # Link the PYTHONHOME version of the headers - mkdir -p $$(PYTHON_INSTALL-$(sdk))/include - ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER) - ifeq ($(os), visionOS) echo "Skipping arch-specific header copying for visionOS" else From 94926c18bff24521c1ebd985b64a10e6902732dd Mon Sep 17 00:00:00 2001 From: John Zhou Date: Sun, 4 May 2025 14:50:04 -0500 Subject: [PATCH 2/2] fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ee64afc..0bdeecd 100644 --- a/Makefile +++ b/Makefile @@ -480,7 +480,7 @@ $$(PYTHON_INCLUDE-$(sdk))/pyconfig.h: $$(PYTHON_LIB-$(sdk)) ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER) # Create the modulemap file - cp -r patch/Python/module.modulemap.prefix $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER) + cp -f patch/Python/module.modulemap.prefix $$(PYTHON_MODULEMAP-$(sdk)) echo "" >> $$(PYTHON_MODULEMAP-$(sdk)) cd $$(PYTHON_SRCDIR-$$(firstword $$(SDK_TARGETS-$(sdk))))/Include && \ find cpython -name "*.h" | sort | sed -e 's/^/ exclude header "/' | sed 's/$$$$/"/' >> $$(PYTHON_MODULEMAP-$(sdk)) && \