@@ -294,9 +294,9 @@ PYTHON_INCLUDE-$(target)=$$(PYTHON_FRAMEWORK-$(target))/Headers
294
294
PYTHON_STDLIB-$(target) =$$(PYTHON_INSTALL-$(target ) ) /lib/python$(PYTHON_VER )
295
295
else
296
296
PYTHON_LIB-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /Python
297
- PYTHON_BIN-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /bin
297
+ PYTHON_BIN-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /Resources/ bin
298
298
PYTHON_INCLUDE-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /Headers
299
- PYTHON_STDLIB-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /lib/python$(PYTHON_VER )
299
+ PYTHON_STDLIB-$(target) =$$(PYTHON_FRAMEWORK-$(target ) ) /Versions/$(PYTHON_VER ) /Resources/ lib/python$(PYTHON_VER )
300
300
endif
301
301
PYTHON_PLATFORM_CONFIG-$(target) =$$(PYTHON_INSTALL-$(target ) ) /platform-config/$$(ARCH-$(target ) ) -$$(SDK-$(target ) )
302
302
PYTHON_PLATFORM_SITECUSTOMIZE-$(target) =$$(PYTHON_PLATFORM_CONFIG-$(target ) ) /sitecustomize.py
@@ -497,9 +497,9 @@ PYTHON_INCLUDE-$(sdk)=$$(PYTHON_FRAMEWORK-$(sdk))/Headers
497
497
PYTHON_STDLIB-$(sdk) =$$(PYTHON_INSTALL-$(sdk ) ) /lib/python$(PYTHON_VER )
498
498
else
499
499
PYTHON_LIB-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /Python
500
- PYTHON_BIN-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /bin
500
+ PYTHON_BIN-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /Resources/ bin
501
501
PYTHON_INCLUDE-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /Headers
502
- PYTHON_STDLIB-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /lib/python$(PYTHON_VER )
502
+ PYTHON_STDLIB-$(sdk) =$$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /Resources/ lib/python$(PYTHON_VER )
503
503
endif
504
504
PYTHON_PLATFORM_CONFIG-$(sdk) =$$(PYTHON_INSTALL-$(sdk ) ) /platform-config
505
505
@@ -530,8 +530,11 @@ endif
530
530
531
531
$$(PYTHON_INCLUDE-$(sdk ) ) /pyconfig.h : $$(PYTHON_LIB-$(sdk ) )
532
532
@echo " >>> Build Python fat headers for the $( sdk) SDK"
533
+ # Copying for Mac Catalyst is done already with the Resources folder
534
+ ifneq ($(sdk ) ,macabi)
533
535
# Copy binary helpers from the first target in the $(sdk) SDK
534
536
cp -r $$(PYTHON_BIN-$$(firstword $$(SDK_TARGETS-$(sdk)))) $$(PYTHON_BIN-$(sdk))
537
+ endif
535
538
536
539
# Create a non-executable stub binary python3
537
540
echo "# !/bin/bash\necho Can\\'t run $(sdk) binary\nexit 1" > $$(PYTHON_BIN-$(sdk))/python$(PYTHON_VER)
@@ -554,8 +557,9 @@ ifneq ($(sdk),macabi)
554
557
mkdir -p $$(PYTHON_INSTALL-$(sdk))/include
555
558
ln -si ../Python.framework/Headers $$(PYTHON_INSTALL-$(sdk))/include/python$(PYTHON_VER)
556
559
else
557
- mkdir -p $$(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)/include
558
- ln -si ../Headers $$(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)/include/python$(PYTHON_VER)
560
+ mkdir -p $$(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)/Resources/include
561
+ rm -rf $(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)/Resources/include/*
562
+ ln -si ../../Headers $$(PYTHON_FRAMEWORK-$(sdk))/Versions/$(PYTHON_VER)/Resources/include/python$(PYTHON_VER)
559
563
endif
560
564
561
565
ifeq ($(os ) , visionOS)
@@ -577,9 +581,11 @@ else
577
581
$$(PYTHON_STDLIB-$(sdk ) ) /LICENSE.TXT : $$(PYTHON_LIB-$(sdk ) ) $$(PYTHON_FRAMEWORK-$(sdk ) ) /Versions/$(PYTHON_VER ) /Resources $$(PYTHON_INCLUDE-$(sdk ) ) /pyconfig.h $$(foreach target,$$(SDK_TARGETS-$(sdk ) ) ,$$(PYTHON_PLATFORM_SITECUSTOMIZE-$$(target ) ) )
578
582
endif
579
583
@echo ">>> Build Python stdlib for the $(sdk) SDK"
584
+ ifneq ($(sdk ) ,macabi)
580
585
mkdir -p $$(PYTHON_STDLIB-$(sdk))/lib-dynload
581
586
# Copy stdlib from the first target associated with the $(sdk) SDK
582
587
cp -r $$(PYTHON_STDLIB-$$(firstword $$(SDK_TARGETS-$(sdk))))/ $$(PYTHON_STDLIB-$(sdk))
588
+ endif
583
589
584
590
# Delete the single-SDK parts of the standard library
585
591
rm -rf \
0 commit comments