Skip to content

Commit e4263f8

Browse files
freakboy3742freakboy3742
committed
Merge branch 'dev' into 3.9
2 parents 7d70b27 + 1ffb5d8 commit e4263f8

File tree

12 files changed

+227
-64
lines changed

12 files changed

+227
-64
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ downloads/libffi-$(LIBFFI_VERSION).tgz:
232232
clean-Python:
233233
@echo ">>> Clean Python build products"
234234
rm -rf \
235+
dist/Python-$(PYTHON_VER)-* \
235236
build/*/Python-$(PYTHON_VERSION)-* \
236237
build/*/python \
237238
build/*/python-*.log \
@@ -469,7 +470,7 @@ $$(PYTHON_DIR-$(target))/Makefile: \
469470
> $$(PYTHON_DIR-$(target))/Modules/Setup.local
470471
# Configure target Python
471472
cd $$(PYTHON_DIR-$(target)) && \
472-
PATH=$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH) \
473+
PATH="$(PROJECT_DIR)/$(PYTHON_DIR-macOS)/_install/bin:$(PATH)" \
473474
./configure \
474475
CC="$$(CC-$(target))" LD="$$(CC-$(target))" \
475476
--host=$$(MACHINE_DETAILED-$(target))-apple-$(shell echo $(os) | tr '[:upper:]' '[:lower:]') \

‎patch/Python/Setup.embedded‎

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,34 @@
22
# Static compilation instructions for all binary modules.
33
#####################################################################
44

5-
_abc _abc.c
5+
*static*
6+
67
_asyncio _asynciomodule.c
78
_bisect _bisectmodule.c
89
_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
910
_bz2 _bz2module.c -I$(srcdir)/../Support/BZip2.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/BZip2.xcframework/{{slice}} -lbzip2
10-
_codecs _codecsmodule.c
1111
_codecs_cn cjkcodecs/_codecs_cn.c
1212
_codecs_hk cjkcodecs/_codecs_hk.c
1313
_codecs_iso2022 cjkcodecs/_codecs_iso2022.c
1414
_codecs_jp cjkcodecs/_codecs_jp.c
1515
_codecs_kr cjkcodecs/_codecs_kr.c
1616
_codecs_tw cjkcodecs/_codecs_tw.c
17-
_collections _collectionsmodule.c
1817
_contextvars _contextvarsmodule.c
1918
_csv _csv.c
2019
_dbm _dbmmodule.c -DHAVE_NDBM_H
2120
_datetime _datetimemodule.c
2221
_elementtree _elementtree.c \
2322
-I$(srcdir)/Modules/expat
2423
-DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI
25-
_functools -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _functoolsmodule.c
2624
_hashlib _hashopenssl.c -I$(srcdir)/../Support/OpenSSL.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/OpenSSL.xcframework/{{slice}} -lOpenSSL -DUSE_SSL
2725
_heapq _heapqmodule.c
28-
_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
2926
_json -I$(srcdir)/Include/internal -DPy_BUILD_CORE_BUILTIN _json.c
30-
_locale _localemodule.c # -lintl
3127
_lsprof _lsprof.c rotatingtree.c
3228
_lzma _lzmamodule.c -I$(srcdir)/../Support/XZ.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/XZ.xcframework/{{slice}} -lxz
3329
_md5 md5module.c
3430
_multibytecodec cjkcodecs/multibytecodec.c
35-
_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c
31+
_multiprocessing -I$(srcdir)/Modules/_multiprocessing _multiprocessing/multiprocessing.c _multiprocessing/semaphore.c
3632
_opcode _opcode.c
37-
_operator _operator.c
3833
_pickle _pickle.c -DPy_BUILD_CORE_MODULE
3934
_posixsubprocess _posixsubprocess.c
4035
_queue _queuemodule.c
@@ -43,9 +38,8 @@ _sha1 sha1module.c
4338
_sha3 _sha3/sha3module.c
4439
_sha256 sha256module.c -DPy_BUILD_CORE_MODULE
4540
_sha512 sha512module.c -DPy_BUILD_CORE_MODULE
46-
_signal -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal signalmodule.c
4741
_socket socketmodule.c
48-
_sqlite3 -I$(srcdir)/Modules/_sqlite -DMODULE_NAME='\"sqlite3\"' -DSQLITE_OMIT_LOAD_EXTENSION -lsqlite3 \
42+
_sqlite3 -I$(srcdir)/Modules/_sqlite -DSQLITE_OMIT_LOAD_EXTENSION -lsqlite3 \
4943
_sqlite/cache.c \
5044
_sqlite/connection.c \
5145
_sqlite/cursor.c \
@@ -55,26 +49,16 @@ _sqlite3 -I$(srcdir)/Modules/_sqlite -DMODULE_NAME='\"sqlite3\"' -DSQLITE_OMIT_L
5549
_sqlite/row.c \
5650
_sqlite/statement.c \
5751
_sqlite/util.c
58-
_sre _sre.c
5952
_ssl _ssl.c -I$(srcdir)/../Support/OpenSSL.xcframework/{{slice}}/Headers -L$(srcdir)/../Support/OpenSSL.xcframework/{{slice}} -lOpenSSL -DUSE_SSL
60-
_stat _stat.c
6153
_statistics _statisticsmodule.c
6254
_struct _struct.c
63-
_symtable symtablemodule.c
64-
_thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c
65-
_tracemalloc _tracemalloc.c
66-
_weakref _weakref.c
6755
_uuid _uuidmodule.c
6856
_zoneinfo _zoneinfo.c -DPy_BUILD_CORE_MODULE
69-
array arraymodule.c
70-
atexit atexitmodule.c
57+
array arraymodule.c -DPy_BUILD_CORE_MODULE
7158
binascii binascii.c
7259
cmath cmathmodule.c _math.c
73-
errno errnomodule.c
74-
faulthandler faulthandler.c
7560
fcntl fcntlmodule.c
7661
grp grpmodule.c
77-
itertools itertoolsmodule.c
7862
math mathmodule.c -DPy_BUILD_CORE_MODULE
7963
mmap mmapmodule.c
8064
parser parsermodule.c
@@ -90,35 +74,74 @@ resource resource.c
9074
select selectmodule.c
9175
syslog syslogmodule.c
9276
termios termios.c
93-
time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c
9477
unicodedata unicodedata.c
9578
zlib zlibmodule.c -I$(prefix)/include -lz
9679

9780
#####################################################################
98-
# Testing modules
81+
# Modules that will be added by the bootstrap
9982
#####################################################################
100-
#_ctypes_test _ctypes/_ctypes_test.c
101-
#_testbuffer _testbuffer.c
102-
#_testcapi _testcapimodule.c
103-
#_testimportmultiple _testimportmultiple.c
104-
#_testinternalcapi _testinternalcapi.c -I$(srcdir)/Include/internal -DPy_BUILD_CORE_MODULE
105-
#_testmultiphase _testmultiphase.c
83+
84+
# _abc
85+
# _codecs
86+
# _collections
87+
# _functools
88+
# _io
89+
# _locale
90+
# _operator
91+
# _signal
92+
# _sre
93+
# _stat
94+
# _symtable
95+
# _thread
96+
# _tracemalloc
97+
# _weakref
98+
# atexit
99+
# errno
100+
# faulthandler
101+
# itertools
102+
# posix
103+
# pwd
104+
# time
106105

107106
#####################################################################
108-
# Modules that require additional frameworks
107+
# DISABLED Testing modules
109108
#####################################################################
110-
#_curses _cursesmodule.c -lcurses -ltermcap
111-
#_curses_panel _curses_panel.c -lpanel -lncurses
112-
#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
113-
#_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I... -L...
114-
#readline readline.c -lreadline -ltermcap
109+
110+
*disabled*
111+
112+
_ctypes_test
113+
_testbuffer
114+
_testcapi
115+
_testimportmultiple
116+
_testinternalcapi
117+
_testmultiphase
118+
_xxsubinterpreters
119+
_xxtestfuzz
120+
xxlimited
121+
xxlimited_35
122+
123+
#####################################################################
124+
# DISABLED Modules that require additional frameworks
125+
#####################################################################
126+
127+
*disabled*
128+
129+
_gdbm
130+
_tkinter
131+
readline
115132

116133
#####################################################################
117134
# Modules that exist, but are deprecated by PEP594 and will be
118135
# removed in Python 3.13
119136
#####################################################################
137+
138+
*static*
139+
120140
_crypt _cryptmodule.c
121141
audioop audioop.c
122-
#nis nismodule.c -lnsl
123-
#ossaudiodev
124-
#spwd spwdmodule.c
142+
143+
*disabled*
144+
145+
nis
146+
ossaudiodev
147+
spwd

‎patch/Python/Setup.iOS‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#####################################################################
22
# iOS: Platform specific configuration
33
#####################################################################
4+
5+
*static*
6+
47
_ctypes _ctypes/_ctypes.c \
58
_ctypes/callbacks.c \
69
_ctypes/callproc.c \
@@ -10,10 +13,10 @@ _ctypes _ctypes/_ctypes.c \
1013
-I$(srcdir)/Modules/_ctypes/darwin \
1114
-I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
1215
-DPy_BUILD_CORE_MODULE \
13-
-DHAVE_FFI_CLOSURE_ALLOC=1 \
14-
-DHAVE_FFI_PREP_CIF_VAR=1 \
15-
-DHAVE_FFI_PREP_CLOSURE_LOC=1 \
16-
-DUSING_MALLOC_CLOSURE_DOT_C=1 \
16+
-DHAVE_FFI_CLOSURE_ALLOC \
17+
-DHAVE_FFI_PREP_CIF_VAR \
18+
-DHAVE_FFI_PREP_CLOSURE_LOC \
19+
-DUSING_MALLOC_CLOSURE_DOT_C \
1720
-L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
1821
-lFFI
1922

@@ -33,4 +36,4 @@ _decimal _decimal/_decimal.c \
3336
_decimal/libmpdec/sixstep.c \
3437
_decimal/libmpdec/transpose.c \
3538
-I$(srcdir)/Modules/_decimal/libmpdec \
36-
-DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
39+
-DCONFIG_64 -DANSI -DHAVE_UINT128_T

‎patch/Python/Setup.macOS‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#####################################################################
22
# macOS: Platform specific configuration
33
#####################################################################
4+
5+
*static*
6+
47
_ctypes _ctypes/_ctypes.c \
58
_ctypes/callbacks.c \
69
_ctypes/callproc.c \
@@ -10,12 +13,12 @@ _ctypes _ctypes/_ctypes.c \
1013
-I$(srcdir)/Modules/_ctypes/darwin \
1114
-I/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi \
1215
-DPy_BUILD_CORE_MODULE \
13-
-DHAVE_FFI_CLOSURE_ALLOC=1 \
14-
-DHAVE_FFI_PREP_CIF_VAR=1 \
15-
-DHAVE_FFI_PREP_CLOSURE_LOC=1 \
16+
-DHAVE_FFI_CLOSURE_ALLOC \
17+
-DHAVE_FFI_PREP_CIF_VAR \
18+
-DHAVE_FFI_PREP_CLOSURE_LOC \
1619
-DMACOSX \
17-
-DUSING_APPLE_OS_LIBFFI=1 \
18-
-DUSING_MALLOC_CLOSURE_DOT_C=1 \
20+
-DUSING_APPLE_OS_LIBFFI \
21+
-DUSING_MALLOC_CLOSURE_DOT_C \
1922
-lffi
2023

2124
_decimal _decimal/_decimal.c \
@@ -34,7 +37,7 @@ _decimal _decimal/_decimal.c \
3437
_decimal/libmpdec/sixstep.c \
3538
_decimal/libmpdec/transpose.c \
3639
-I$(srcdir)/Modules/_decimal/libmpdec \
37-
-DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
40+
-DCONFIG_64 -DANSI -DHAVE_UINT128_T
3841

3942
_posixshmem -I$(srcdir)/Modules/_multiprocessing _multiprocessing/posixshmem.c
4043

‎patch/Python/Setup.tvOS‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#####################################################################
22
# tvOS: Platform specific configuration
33
#####################################################################
4+
5+
*static*
6+
47
_ctypes _ctypes/_ctypes.c \
58
_ctypes/callbacks.c \
69
_ctypes/callproc.c \
@@ -10,10 +13,10 @@ _ctypes _ctypes/_ctypes.c \
1013
-I$(srcdir)/Modules/_ctypes/darwin \
1114
-I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
1215
-DPy_BUILD_CORE_MODULE \
13-
-DHAVE_FFI_CLOSURE_ALLOC=1 \
14-
-DHAVE_FFI_PREP_CIF_VAR=1 \
15-
-DHAVE_FFI_PREP_CLOSURE_LOC=1 \
16-
-DUSING_MALLOC_CLOSURE_DOT_C=1 \
16+
-DHAVE_FFI_CLOSURE_ALLOC \
17+
-DHAVE_FFI_PREP_CIF_VAR \
18+
-DHAVE_FFI_PREP_CLOSURE_LOC \
19+
-DUSING_MALLOC_CLOSURE_DOT_C \
1720
-L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
1821
-lFFI
1922

@@ -33,4 +36,4 @@ _decimal _decimal/_decimal.c \
3336
_decimal/libmpdec/sixstep.c \
3437
_decimal/libmpdec/transpose.c \
3538
-I$(srcdir)/Modules/_decimal/libmpdec \
36-
-DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
39+
-DCONFIG_64 -DANSI -DHAVE_UINT128_T

‎patch/Python/Setup.watchOS‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#####################################################################
22
# watchOS: Platform specific configuration
33
#####################################################################
4+
5+
*static*
6+
47
_ctypes _ctypes/_ctypes.c \
58
_ctypes/callbacks.c \
69
_ctypes/callproc.c \
@@ -10,9 +13,9 @@ _ctypes _ctypes/_ctypes.c \
1013
-I$(srcdir)/Modules/_ctypes/darwin \
1114
-I$(srcdir)/../Support/libFFI.xcframework/{{slice}}/Headers \
1215
-DPy_BUILD_CORE_MODULE \
13-
-DHAVE_FFI_CLOSURE_ALLOC=1 \
14-
-DHAVE_FFI_PREP_CIF_VAR=1 \
15-
-DHAVE_FFI_PREP_CLOSURE_LOC=1 \
16-
-DUSING_MALLOC_CLOSURE_DOT_C=1 \
16+
-DHAVE_FFI_CLOSURE_ALLOC \
17+
-DHAVE_FFI_PREP_CIF_VAR \
18+
-DHAVE_FFI_PREP_CLOSURE_LOC \
19+
-DUSING_MALLOC_CLOSURE_DOT_C \
1720
-L$(srcdir)/../Support/libFFI.xcframework/{{slice}} \
1821
-lFFI

‎patch/Python/Setup.watchos.arm64_32‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# watchOS ARM64_32: Target specific configuration
33
#####################################################################
44

5+
*static*
6+
57
_decimal _decimal/_decimal.c \
68
_decimal/libmpdec/basearith.c \
79
_decimal/libmpdec/constants.c \
@@ -18,4 +20,4 @@ _decimal _decimal/_decimal.c \
1820
_decimal/libmpdec/sixstep.c \
1921
_decimal/libmpdec/transpose.c \
2022
-I$(srcdir)/Modules/_decimal/libmpdec \
21-
-DCONFIG_32=1 -DANSI=1
23+
-DCONFIG_32 -DANSI

‎patch/Python/Setup.watchsimulator.arm64‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# watchOS Simulator ARM64: Target specific configuration
33
#####################################################################
44

5+
*static*
6+
57
_decimal _decimal/_decimal.c \
68
_decimal/libmpdec/basearith.c \
79
_decimal/libmpdec/constants.c \
@@ -18,4 +20,4 @@ _decimal _decimal/_decimal.c \
1820
_decimal/libmpdec/sixstep.c \
1921
_decimal/libmpdec/transpose.c \
2022
-I$(srcdir)/Modules/_decimal/libmpdec \
21-
-DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
23+
-DCONFIG_64 -DANSI -DHAVE_UINT128_T

‎patch/Python/Setup.watchsimulator.x86_64‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# watchOS simulator x86_64: Target specific configuration
33
#####################################################################
44

5+
*static*
6+
57
_decimal _decimal/_decimal.c \
68
_decimal/libmpdec/basearith.c \
79
_decimal/libmpdec/constants.c \
@@ -18,4 +20,4 @@ _decimal _decimal/_decimal.c \
1820
_decimal/libmpdec/sixstep.c \
1921
_decimal/libmpdec/transpose.c \
2022
-I$(srcdir)/Modules/_decimal/libmpdec \
21-
-DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
23+
-DCONFIG_64 -DANSI -DHAVE_UINT128_T

‎tests/testbed/pyproject.toml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ requires = [
2121
"std-nslog",
2222
]
2323
support_package = "../../dist/Python-3.9-macOS-support.custom.tar.gz"
24-
template = "../../../../templates/briefcase-macOS-Xcode-template"
2524

2625
[tool.briefcase.app.testbed.linux]
2726
supported = false
@@ -36,7 +35,6 @@ requires = [
3635
"std-nslog",
3736
]
3837
support_package = "../../dist/Python-3.9-iOS-support.custom.tar.gz"
39-
template = "../../../../templates/briefcase-iOS-Xcode-template"
4038

4139
[tool.briefcase.app.testbed.android]
4240
supported = false

0 commit comments

Comments
 (0)