Skip to content

Commit 7eed1bb

Browse files
committed
Correct iOS naming of XZ library, and include a stub sysconfigdata module.
1 parent 6ad009a commit 7eed1bb

7 files changed

+58
-1
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
400400
CFLAGS="$$(CFLAGS-$(target))" \
401401
LDFLAGS="$$(LDFLAGS-$(target))" \
402402
LIBLZMA_CFLAGS="-I$$(XZ_MERGE-$$(SDK-$(target)))/include" \
403-
LIBLZMA_LIBS="-L$$(XZ_MERGE-$$(SDK-$(target)))/lib -lxz" \
403+
LIBLZMA_LIBS="-L$$(XZ_MERGE-$$(SDK-$(target)))/lib -llzma" \
404404
BZIP2_CFLAGS="-I$$(BZIP2_MERGE-$$(SDK-$(target)))/include" \
405405
BZIP2_LIBS="-L$$(BZIP2_MERGE-$$(SDK-$(target)))/lib -lbzip2" \
406406
LIBFFI_INCLUDEDIR="$$(LIBFFI_MERGE-$$(SDK-$(target)))/include" \
@@ -689,6 +689,9 @@ $$(PYTHON_FATSTDLIB-$(sdk)): $$(PYTHON_FATLIB-$(sdk))
689689
$$(PYTHON_FATSTDLIB-$(sdk))/config-* \
690690
$$(PYTHON_FATSTDLIB-$(sdk))/lib-dynload/*
691691

692+
# Copy the cross-target _sysconfigdata module from the patch folder
693+
cp $(PROJECT_DIR)/patch/Python/_sysconfigdata__$$(OS_LOWER-$(sdk))_$(sdk).py $$(PYTHON_FATSTDLIB-$(sdk))
694+
692695
# Copy the individual _sysconfigdata modules into names that include the architecture
693696
$$(foreach target,$$(SDK_TARGETS-$(sdk)),cp $$(PYTHON_INSTALL-$$(target))/lib/python$(PYTHON_VER)/_sysconfigdata__$$(OS_LOWER-$(sdk))_$(sdk).py $$(PYTHON_FATSTDLIB-$(sdk))/_sysconfigdata__$$(OS_LOWER-$(sdk))_$(sdk)_$$(ARCH-$$(target)).py; )
694697

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'arm64':
6+
from _sysconfigdata__ios_iphoneos_arm64 import *
7+
else:
8+
raise RuntimeError("Unknown iOS architecture.")
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'x86_64':
6+
from _sysconfigdata__ios_iphonesimulator_x86_64 import *
7+
elif arch == 'arm64':
8+
from _sysconfigdata__ios_iphonesimulator_arm64 import *
9+
else:
10+
raise RuntimeError("Unknown iOS simulator architecture.")
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'arm64':
6+
from _sysconfigdata__tvos_appletvos_arm64 import *
7+
else:
8+
raise RuntimeError("Unknown tvOS architecture.")
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'x86_64':
6+
from _sysconfigdata__tvos_appletvsimulator_x86_64 import *
7+
elif arch == 'arm64':
8+
from _sysconfigdata__tvos_appletvsimulator_arm64 import *
9+
else:
10+
raise RuntimeError("Unknown tvOS simulator architecture.")
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'arm64_32':
6+
from _sysconfigdata__watchos_watchos_arm64_32 import *
7+
else:
8+
raise RuntimeError("Unknown watchOS architecture.")
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import platform
2+
3+
4+
arch = platform.machine()
5+
if arch == 'x86_64':
6+
from _sysconfigdata__watchos_watchsimulator_x86_64 import *
7+
elif arch == 'arm64':
8+
from _sysconfigdata__watchos_watchsimulator_arm64 import *
9+
else:
10+
raise RuntimeError("Unknown watchOS simulator architecture.")

0 commit comments

Comments
 (0)