Merge branch 'dev' into 3.9

beeware · Jul 31, 2021 · 20767f8 · 20767f8
2 parents 5bf304e + cb7e5fe
commit 20767f8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -237,13 +237,13 @@ endif
 ifeq ($2,macOS)
 	cd $$(OPENSSL_DIR-$1) && \
 	CC="$$(CC-$1)" MACOSX_DEPLOYMENT_TARGET=$$(MACOSX_DEPLOYMENT_TARGET) \
-		./Configure darwin64-$$(ARCH-$1)-cc no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl --openssldir=$(PROJECT_DIR)/build/$2/openssl
+		./Configure darwin64-$$(ARCH-$1)-cc no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl
 else
 	cd $$(OPENSSL_DIR-$1) && \
 		CC="$$(CC-$1)" \
 		CROSS_TOP="$$(dir $$(SDK_ROOT-$1)).." \
 		CROSS_SDK="$$(notdir $$(SDK_ROOT-$1))" \
-		./Configure iphoneos-cross no-asm no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl --openssldir=$(PROJECT_DIR)/build/$2/openssl
+		./Configure iphoneos-cross no-asm no-tests --prefix=$(PROJECT_DIR)/build/$2/openssl
 endif
 
 # Build OpenSSL

diff --git a/patch/Python/Setup.embedded b/patch/Python/Setup.embedded
@@ -28,7 +28,7 @@ _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.o rotatingtree.c
+_lsprof _lsprof.c rotatingtree.c
 _lzma _lzmamodule.c -I$(srcdir)/../Support/XZ/Headers -L$(srcdir)/../Support/XZ/ -lxz
 _md5 md5module.c
 _multibytecodec cjkcodecs/multibytecodec.c
@@ -65,8 +65,8 @@ _thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c
 _tracemalloc _tracemalloc.c
 _weakref _weakref.c
 _uuid _uuidmodule.c
-atexit atexitmodule.c
 array arraymodule.c
+atexit atexitmodule.c
 audioop audioop.c
 binascii binascii.c
 cmath cmathmodule.c _math.c
@@ -112,7 +112,6 @@ zlib zlibmodule.c -I$(prefix)/include -lz
 #_dbm _dbmmodule.c
 #_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 #_posixshmem _multiprocessing/posixshmem.c
-#_scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
 #_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I... -L...
 #nis nismodule.c -lnsl
 #ossaudiodev

diff --git a/patch/Python/Setup.iOS b/patch/Python/Setup.iOS
@@ -15,7 +15,6 @@ _ctypes _ctypes/_ctypes.c \
     -L$(srcdir)/../Support/libFFI \
     -lFFI
 
-
 _decimal _decimal/_decimal.c \
     _decimal/libmpdec/basearith.c \
     _decimal/libmpdec/constants.c \

diff --git a/patch/Python/Setup.macOS b/patch/Python/Setup.macOS
@@ -15,7 +15,6 @@ _ctypes _ctypes/_ctypes.c \
     -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1 \
     -lffi
 
-
 _decimal _decimal/_decimal.c \
     _decimal/libmpdec/basearith.c \
     _decimal/libmpdec/constants.c \
@@ -33,3 +32,5 @@ _decimal _decimal/_decimal.c \
     _decimal/libmpdec/transpose.c \
     -I$(srcdir)/Modules/_decimal/libmpdec \
     -DCONFIG_64=1 -DANSI=1 -DHAVE_UINT128_T=1
+
+_scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
diff --git a/patch/Python/Setup.tvOS b/patch/Python/Setup.tvOS
@@ -15,7 +15,6 @@ _ctypes _ctypes/_ctypes.c \
     -L$(srcdir)/../Support/libFFI \
     -lFFI
 
-
 _decimal _decimal/_decimal.c \
     _decimal/libmpdec/basearith.c \
     _decimal/libmpdec/constants.c \

diff --git a/patch/Python/Setup.watchOS b/patch/Python/Setup.watchOS
@@ -15,7 +15,6 @@ _ctypes _ctypes/_ctypes.c \
     -L$(srcdir)/../Support/libFFI \
     -lFFI
 
-
 _decimal _decimal/_decimal.c \
     _decimal/libmpdec/basearith.c \
     _decimal/libmpdec/constants.c \