Migrated Python to use XCframework

Author: freakboy3742

Makefile

@@ -6,7 +6,7 @@ _abc _abc.c
 _asyncio _asynciomodule.c
 _bisect _bisectmodule.c
 _blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
-_bz2 _bz2module.c -I$(srcdir)/../Support/BZip2/Headers -L$(srcdir)/../Support/BZip2 -lbzip2
+_bz2 _bz2module.c -I$(srcdir)/../Support/BZip2.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/BZip2.xcframework/{{slice}} -lbzip2
 _codecs _codecsmodule.c
 _codecs_cn cjkcodecs/_codecs_cn.c
 _codecs_hk cjkcodecs/_codecs_hk.c
@@ -23,21 +23,19 @@ _elementtree _elementtree.c \
     -I$(srcdir)/Modules/expat
     -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
 _functools -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _functoolsmodule.c
-_hashlib _hashopenssl.c -I$(srcdir)/../Support/OpenSSL/Headers -L$(srcdir)/../Support/OpenSSL -lOpenSSL -DUSE_SSL
+_hashlib _hashopenssl.c -I$(srcdir)/../Support/OpenSSL.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/OpenSSL.xcframework/{{slice}} -lOpenSSL -DUSE_SSL
 _heapq _heapqmodule.c
 _io -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c
 _json -I$(srcdir)/Include/internal -DPy_BUILD_CORE_BUILTIN _json.c
 _locale _localemodule.c  # -lintl
 _lsprof _lsprof.c rotatingtree.c
-_lzma _lzmamodule.c -I$(srcdir)/../Support/XZ/Headers -L$(srcdir)/../Support/XZ/ -lxz
+_lzma _lzmamodule.c -I$(srcdir)/../Support/XZ.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/XZ.xcframework/{{slice}} -lxz
 _md5 md5module.c
 _multibytecodec cjkcodecs/multibytecodec.c
 _multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c
 _opcode _opcode.c
 _operator _operator.c
 _pickle _pickle.c -DPy_BUILD_CORE_MODULE
-_posixsubprocess _posixsubprocess.c
-_posixshmem -I$(srcdir)/Modules/_multiprocessing posixshmem.c
 _queue _queuemodule.c
 _random _randommodule.c -DPy_BUILD_CORE_MODULE
 _sha1 sha1module.c
@@ -57,7 +55,7 @@ _sqlite3 -I$(srcdir)/Modules/_sqlite -DMODULE_NAME='\"sqlite3\"' -DSQLITE_OMIT_L
     _sqlite/statement.c \
     _sqlite/util.c
 _sre _sre.c
-_ssl _ssl.c -I$(srcdir)/../Support/OpenSSL/Headers -L$(srcdir)/../Support/OpenSSL -lOpenSSL -DUSE_SSL
+_ssl _ssl.c -I$(srcdir)/../Support/OpenSSL.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/OpenSSL.xcframework/{{slice}} -lOpenSSL -DUSE_SSL
 _stat _stat.c
 _statistics _statisticsmodule.c
 _struct _struct.c

patch/Python/Setup.embedded

@@ -1,4 +1,3 @@
-
 #####################################################################
 # iOS: Platform specific configuration
 #####################################################################
@@ -9,10 +8,10 @@ _ctypes _ctypes/_ctypes.c \
     _ctypes/cfield.c \
     _ctypes/malloc_closure.c \
     -I$(srcdir)/Modules/_ctypes/darwin \
-    -I$(srcdir)/../Support/libFFI/Headers \
+    -I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
     -DPy_BUILD_CORE_MODULE \
     -DHAVE_FFI_PREP_CLOSURE_LOC=1 \
-    -L$(srcdir)/../Support/libFFI \
+    -L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
     -lFFI
 
 _decimal _decimal/_decimal.c \

patch/Python/Setup.iOS

@@ -1,4 +1,3 @@
-
 #####################################################################
 # macOS: Platform specific configuration
 #####################################################################
@@ -10,9 +9,13 @@ _ctypes _ctypes/_ctypes.c \
     _ctypes/malloc_closure.c \
     -I$(srcdir)/Modules/_ctypes/darwin \
     -I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi \
-    -DPy_BUILD_CORE_MODULE -DUSING_MALLOC_CLOSURE_DOT_C=1 -DMACOSX \
-    -DUSING_APPLE_OS_LIBFFI=1 -DHAVE_FFI_PREP_CIF_VAR=1 \
-    -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1 \
+    -DPy_BUILD_CORE_MODULE \
+    -DHAVE_FFI_CLOSURE_ALLOC=1 \
+    -DHAVE_FFI_PREP_CIF_VAR=1 \
+    -DHAVE_FFI_PREP_CLOSURE_LOC=1 \
+    -DMACOSX \
+    -DUSING_APPLE_OS_LIBFFI=1 \
+    -DUSING_MALLOC_CLOSURE_DOT_C=1 \
     -lffi
 
 _decimal _decimal/_decimal.c \
@@ -33,6 +36,9 @@ _decimal _decimal/_decimal.c \
     -I$(srcdir)/Modules/_decimal/libmpdec \
     -DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
 
+_posixshmem -I$(srcdir)/Modules/_multiprocessing _multiprocessing/posixshmem.c
+_posixsubprocess _posixsubprocess.c
+
 _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
 
 _curses _cursesmodule.c -lcurses -ltermcap

patch/Python/Setup.macOS

@@ -1,4 +1,3 @@
-
 #####################################################################
 # tvOS: Platform specific configuration
 #####################################################################
@@ -9,10 +8,10 @@ _ctypes _ctypes/_ctypes.c \
     _ctypes/cfield.c \
     _ctypes/malloc_closure.c \
     -I$(srcdir)/Modules/_ctypes/darwin \
-    -I$(srcdir)/../Support/libFFI/Headers \
+    -I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
     -DPy_BUILD_CORE_MODULE \
     -DHAVE_FFI_PREP_CLOSURE_LOC=1 \
-    -L$(srcdir)/../Support/libFFI \
+    -L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
     -lFFI
 
 _decimal _decimal/_decimal.c \

patch/Python/Setup.tvOS

@@ -1,4 +1,3 @@
-
 #####################################################################
 # watchOS: Platform specific configuration
 #####################################################################
@@ -9,26 +8,8 @@ _ctypes _ctypes/_ctypes.c \
     _ctypes/cfield.c \
     _ctypes/malloc_closure.c \
     -I$(srcdir)/Modules/_ctypes/darwin \
-    -I$(srcdir)/../Support/libFFI/Headers \
+    -I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
     -DPy_BUILD_CORE_MODULE \
     -DHAVE_FFI_PREP_CLOSURE_LOC=1 \
-    -L$(srcdir)/../Support/libFFI \
+    -L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
     -lFFI
-
-_decimal _decimal/_decimal.c \
-    _decimal/libmpdec/basearith.c \
-    _decimal/libmpdec/constants.c \
-    _decimal/libmpdec/context.c \
-    _decimal/libmpdec/convolute.c \
-    _decimal/libmpdec/crt.c \
-    _decimal/libmpdec/difradix2.c \
-    _decimal/libmpdec/fnt.c \
-    _decimal/libmpdec/fourstep.c \
-    _decimal/libmpdec/io.c \
-    _decimal/libmpdec/mpalloc.c \
-    _decimal/libmpdec/mpdecimal.c \
-    _decimal/libmpdec/numbertheory.c \
-    _decimal/libmpdec/sixstep.c \
-    _decimal/libmpdec/transpose.c \
-    -I$(srcdir)/Modules/_decimal/libmpdec \
-    -DCONFIG_32=1 -DANSI=1

patch/Python/Setup.watchOS

@@ -0,0 +1,21 @@
+#####################################################################
+# watchOS ARM64_32: Target specific configuration
+#####################################################################
+
+_decimal _decimal/_decimal.c \
+    _decimal/libmpdec/basearith.c \
+    _decimal/libmpdec/constants.c \
+    _decimal/libmpdec/context.c \
+    _decimal/libmpdec/convolute.c \
+    _decimal/libmpdec/crt.c \
+    _decimal/libmpdec/difradix2.c \
+    _decimal/libmpdec/fnt.c \
+    _decimal/libmpdec/fourstep.c \
+    _decimal/libmpdec/io.c \
+    _decimal/libmpdec/mpalloc.c \
+    _decimal/libmpdec/mpdecimal.c \
+    _decimal/libmpdec/numbertheory.c \
+    _decimal/libmpdec/sixstep.c \
+    _decimal/libmpdec/transpose.c \
+    -I$(srcdir)/Modules/_decimal/libmpdec \
+    -DCONFIG_32=1 -DANSI=1

patch/Python/Setup.watchos.arm64_32

@@ -0,0 +1,21 @@
+#####################################################################
+# watchOS Simulator ARM64: Target specific configuration
+#####################################################################
+
+_decimal _decimal/_decimal.c \
+    _decimal/libmpdec/basearith.c \
+    _decimal/libmpdec/constants.c \
+    _decimal/libmpdec/context.c \
+    _decimal/libmpdec/convolute.c \
+    _decimal/libmpdec/crt.c \
+    _decimal/libmpdec/difradix2.c \
+    _decimal/libmpdec/fnt.c \
+    _decimal/libmpdec/fourstep.c \
+    _decimal/libmpdec/io.c \
+    _decimal/libmpdec/mpalloc.c \
+    _decimal/libmpdec/mpdecimal.c \
+    _decimal/libmpdec/numbertheory.c \
+    _decimal/libmpdec/sixstep.c \
+    _decimal/libmpdec/transpose.c \
+    -I$(srcdir)/Modules/_decimal/libmpdec \
+    -DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1

patch/Python/Setup.watchsimulator.arm64

@@ -0,0 +1,21 @@
+#####################################################################
+# watchOS simulator x86_64: Target specific configuration
+#####################################################################
+
+_decimal _decimal/_decimal.c \
+    _decimal/libmpdec/basearith.c \
+    _decimal/libmpdec/constants.c \
+    _decimal/libmpdec/context.c \
+    _decimal/libmpdec/convolute.c \
+    _decimal/libmpdec/crt.c \
+    _decimal/libmpdec/difradix2.c \
+    _decimal/libmpdec/fnt.c \
+    _decimal/libmpdec/fourstep.c \
+    _decimal/libmpdec/io.c \
+    _decimal/libmpdec/mpalloc.c \
+    _decimal/libmpdec/mpdecimal.c \
+    _decimal/libmpdec/numbertheory.c \
+    _decimal/libmpdec/sixstep.c \
+    _decimal/libmpdec/transpose.c \
+    -I$(srcdir)/Modules/_decimal/libmpdec \
+    -DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1

patch/Python/Setup.watchsimulator.x86_64

@@ -2,6 +2,10 @@
 #include "pyconfig-armv7k.h"
 #endif
 
-#ifdef __i386__
-#include "pyconfig-i386.h"
+#ifdef __arm64__
+#include "pyconfig-arm64.h"
 #endif
+
+#ifdef __x86_64__
+#include "pyconfig-x86_64.h"
+#endif