Merge branch 'main' into 3.10

beeware · Sep 23, 2022 · f5b7b53 · f5b7b53
2 parents a21651a + 7b4e73e
commit f5b7b53
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -39,15 +39,15 @@ jobs:
 
           Includes:
           * Python ${{ env.PY_VERSION }}.?
-          * OpenSSL 1.1.1?
+          * OpenSSL 3.0.5
           * BZip2 1.0.8
-          * XZ 5.2.5
+          * XZ 5.2.6
           * LibFFI 3.4.2
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
 
   build:
-    runs-on: macOS-11.0
+    runs-on: macOS-12
     needs: make-release
     strategy:
       max-parallel: 4

diff --git a/Makefile b/Makefile
@@ -221,15 +221,14 @@ TARGET_TRIPLE-$(target)=$$(ARCH-$(target))-apple-$$(OS_LOWER-$(target))-simulato
 endif
 
 SDK_ROOT-$(target)=$$(shell xcrun --sdk $$(SDK-$(target)) --show-sdk-path)
-CC-$(target)=xcrun --sdk $$(SDK-$(target)) clang
+CC-$(target)=xcrun --sdk $$(SDK-$(target)) clang -target $$(TARGET_TRIPLE-$(target))
+CPP-$(target)=xcrun --sdk $$(SDK-$(target)) clang -target $$(TARGET_TRIPLE-$(target)) -E
 CXX-$(target)=xcrun --sdk $$(SDK-$(target)) clang
 AR-$(target)=xcrun --sdk $$(SDK-$(target)) ar
 CFLAGS-$(target)=\
-	-target $$(TARGET_TRIPLE-$(target)) \
 	--sysroot=$$(SDK_ROOT-$(target)) \
 	$$(CFLAGS-$(os))
 LDFLAGS-$(target)=\
-	-target $$(TARGET_TRIPLE-$(target)) \
 	--sysroot=$$(SDK_ROOT-$(target)) \
 	$$(CFLAGS-$(os))
 
@@ -553,6 +552,7 @@ $$(PYTHON_SRCDIR-$(target))/Makefile: \
 		./configure \
 			AR="$$(AR-$(target))" \
 			CC="$$(CC-$(target))" \
+			CPP="$$(CPP-$(target))" \
 			CXX="$$(CXX-$(target))" \
 			CFLAGS="$$(CFLAGS-$(target)) -I$$(BZIP2_MERGE-$$(SDK-$(target)))/include -I$$(XZ_MERGE-$$(SDK-$(target)))/include" \
 			LDFLAGS="$$(LDFLAGS-$(target)) -L$$(BZIP2_MERGE-$$(SDK-$(target)))/lib -L$$(XZ_MERGE-$$(SDK-$(target)))/lib" \
@@ -598,6 +598,7 @@ vars-$(target):
 	@echo "TARGET_TRIPLE-$(target): $$(TARGET_TRIPLE-$(target))"
 	@echo "SDK_ROOT-$(target): $$(SDK_ROOT-$(target))"
 	@echo "CC-$(target): $$(CC-$(target))"
+	@echo "CPP-$(target): $$(CPP-$(target))"
 	@echo "CFLAGS-$(target): $$(CFLAGS-$(target))"
 	@echo "LDFLAGS-$(target): $$(LDFLAGS-$(target))"
 	@echo "BZIP2_SRCDIR-$(target): $$(BZIP2_SRCDIR-$(target))"
@@ -652,10 +653,9 @@ SDK_SLICE-$(sdk)=$$(OS_LOWER-$(sdk))-$$(shell echo $$(SDK_ARCHES-$(sdk)) | sed "
 endif
 
 CC-$(sdk)=xcrun --sdk $(sdk) clang
-CFLAGS-$(sdk)=\
-	$$(CFLAGS-$(os))
-LDFLAGS-$(sdk)=\
-	$$(CFLAGS-$(os))
+CPP-$(sdk)=xcrun --sdk $(sdk) clang -E
+CFLAGS-$(sdk)=$$(CFLAGS-$(os))
+LDFLAGS-$(sdk)=$$(CFLAGS-$(os))
 
 # Predeclare SDK constants that are used by the build-target macro
 
@@ -770,6 +770,7 @@ $$(PYTHON_SRCDIR-$(sdk))/Makefile: \
 	cd $$(PYTHON_SRCDIR-$(sdk)) && \
 		./configure \
 			CC="$$(CC-$(sdk))" \
+			CPP="$$(CPP-$(sdk))" \
 			CFLAGS="$$(CFLAGS-$(sdk)) -I$$(BZIP2_MERGE-$(sdk))/include -I$$(XZ_MERGE-$(sdk))/include" \
 			LDFLAGS="$$(LDFLAGS-$(sdk)) -L$$(XZ_MERGE-$(sdk))/lib -L$$(BZIP2_MERGE-$(sdk))/lib" \
 			--prefix="$$(PYTHON_INSTALL-$(sdk))" \
@@ -869,6 +870,7 @@ vars-$(sdk):
 	@echo "SDK_ARCHES-$(sdk): $$(SDK_ARCHES-$(sdk))"
 	@echo "SDK_SLICE-$(sdk): $$(SDK_SLICE-$(sdk))"
 	@echo "CC-$(sdk): $$(CC-$(sdk))"
+	@echo "CPP-$(sdk): $$(CPP-$(sdk))"
 	@echo "CFLAGS-$(sdk): $$(CFLAGS-$(sdk))"
 	@echo "LDFLAGS-$(sdk): $$(LDFLAGS-$(sdk))"
 	@echo "BZIP2_MERGE-$(sdk): $$(BZIP2_MERGE-$(sdk))"

diff --git a/patch/libffi-3.4.2.patch b/patch/libffi-3.4.2.patch
@@ -222,10 +222,10 @@ index 9921b0d..5b60ccc 100755
 -        copy_src_platform_files(ios_simulator64_platform)
 -        copy_src_platform_files(ios_device_platform)
 -        copy_src_platform_files(ios_device64_platform)
-+        copy_src_platform_files(ios_simulator_i386_platform)
++        # copy_src_platform_files(ios_simulator_i386_platform)
 +        copy_src_platform_files(ios_simulator_x86_64_platform)
 +        copy_src_platform_files(ios_simulator_arm64_platform)
-+        copy_src_platform_files(ios_device_armv7_platform)
++        # copy_src_platform_files(ios_device_armv7_platform)
 +        copy_src_platform_files(ios_device_arm64_platform)
      if generate_osx:
 -        copy_src_platform_files(desktop64_platform)
@@ -240,9 +240,9 @@ index 9921b0d..5b60ccc 100755
      if generate_watchos:
 -        copy_src_platform_files(watchos_simulator_platform)
 -        copy_src_platform_files(watchos_device_platform)
-+        copy_src_platform_files(watchos_simulator_i386_platform)
++        # copy_src_platform_files(watchos_simulator_i386_platform)
 +        copy_src_platform_files(watchos_simulator_x86_64_platform)
-+        copy_src_platform_files(watchos_simulator_arm64_platform)
++        # copy_src_platform_files(watchos_simulator_arm64_platform)
 +        copy_src_platform_files(watchos_device_armv7k_platform)
 +        copy_src_platform_files(watchos_device_arm64_32_platform)
 
@@ -253,10 +253,10 @@ index 9921b0d..5b60ccc 100755
 -        build_target(ios_simulator64_platform, platform_headers)
 -        build_target(ios_device_platform, platform_headers)
 -        build_target(ios_device64_platform, platform_headers)
-+        build_target(ios_simulator_i386_platform, platform_headers)
++        # build_target(ios_simulator_i386_platform, platform_headers)
 +        build_target(ios_simulator_x86_64_platform, platform_headers)
 +        build_target(ios_simulator_arm64_platform, platform_headers)
-+        build_target(ios_device_armv7_platform, platform_headers)
++        # build_target(ios_device_armv7_platform, platform_headers)
 +        build_target(ios_device_arm64_platform, platform_headers)
      if generate_osx:
 -        build_target(desktop64_platform, platform_headers)
@@ -271,10 +271,10 @@ index 9921b0d..5b60ccc 100755
      if generate_watchos:
 -        build_target(watchos_simulator_platform, platform_headers)
 -        build_target(watchos_device_platform, platform_headers)
-+        build_target(watchos_simulator_i386_platform, platform_headers)
++        # build_target(watchos_simulator_i386_platform, platform_headers)
 +        build_target(watchos_simulator_x86_64_platform, platform_headers)
 +        build_target(watchos_simulator_arm64_platform, platform_headers)
-+        build_target(watchos_device_armv7k_platform, platform_headers)
++        # build_target(watchos_device_armv7k_platform, platform_headers)
 +        build_target(watchos_device_arm64_32_platform, platform_headers)
 
      mkdir_p('darwin_common/include')