More progress, new patches needed.

Author: kpfleming

cpython-unix/build-cpython-host.sh

@@ -38,7 +38,9 @@ pushd "Python-${PYTHON_VERSION}"
 # configure. This is reported as https://bugs.python.org/issue45405. We nerf the
 # check since we know what we're doing.
 if [ "${CC}" = "clang" ]; then
-  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
+  if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+    patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
+  elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
     patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
   else
     patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch

cpython-unix/build-cpython.sh

@@ -72,7 +72,10 @@ cat Makefile.extra
 pushd Python-${PYTHON_VERSION}
 
 # configure doesn't support cross-compiling on Apple. Teach it.
-if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_12}" ]; then
+if [ "${PYTHON_MAJMIN_VERSION}" = "3.13" ]; then
+    # FIXME: new patch may be required
+    :
+elif [ "${PYTHON_MAJMIN_VERSION}" = "3.12" ]; then
     patch -p1 -i ${ROOT}/patch-apple-cross-3.12.patch
 else
     patch -p1 -i ${ROOT}/patch-apple-cross.patch
@@ -105,7 +108,9 @@ fi
 # configure. This is reported as https://bugs.python.org/issue45405. We nerf the
 # check since we know what we're doing.
 if [ "${CC}" = "clang" ]; then
-    if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
+    if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+        patch -p1 -i ${ROOT}/patch-disable-multiarch-13.patch
+    elif [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_9}" ]; then
         patch -p1 -i ${ROOT}/patch-disable-multiarch.patch
     else
         patch -p1 -i ${ROOT}/patch-disable-multiarch-legacy.patch
@@ -136,7 +141,11 @@ fi
 
 # The default build rule for the macOS dylib doesn't pick up libraries
 # from modules / makesetup. So patch it accordingly.
-patch -p1 -i ${ROOT}/patch-macos-link-extension-modules.patch
+if [ -n "${PYTHON_MEETS_MINIMUM_VERSION_3_13}" ]; then
+    patch -p1 -i ${ROOT}/patch-macos-link-extension-modules-13.patch
+else
+    patch -p1 -i ${ROOT}/patch-macos-link-extension-modules.patch
+fi
 
 # Also on macOS, the `python` executable is linked against libraries defined by statically
 # linked modules. But those libraries should only get linked into libpython, not the

cpython-unix/build.py

@@ -435,6 +435,7 @@ def build_cpython_host(
         support = {
             "build-cpython-host.sh",
             "patch-disable-multiarch.patch",
+            "patch-disable-multiarch-13.patch",
             "patch-disable-multiarch-legacy.patch",
         }
         for s in sorted(support):

cpython-unix/patch-disable-multiarch-13.patch

@@ -0,0 +1,17 @@
+diff -u 13-a/configure.ac 13-b/configure.ac
+--- 13-a/configure.ac	2024-05-08 05:21:00.000000000 -0400
++++ 13-b/configure.ac	2024-05-19 07:42:23.294762624 -0400
+@@ -1090,12 +1090,7 @@
+ dnl architecture. PLATFORM_TRIPLET will be a pair or single value for these
+ dnl platforms.
+ AC_MSG_CHECKING([for multiarch])
+-AS_CASE([$ac_sys_system],
+-  [Darwin*], [MULTIARCH=""],
+-  [iOS], [MULTIARCH=""],
+-  [FreeBSD*], [MULTIARCH=""],
+-  [MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
+-)
++MULTIARCH=
+ AC_SUBST([MULTIARCH])
+ 
+ if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then

cpython-unix/patch-macos-link-extension-modules-13.patch

@@ -0,0 +1,12 @@
+diff -u 13-a/Makefile.pre.in 13-b/Makefile.pre.in
+--- 13-a/Makefile.pre.in	2024-05-08 05:21:00.000000000 -0400
++++ 13-b/Makefile.pre.in	2024-05-19 07:55:45.091521909 -0400
+@@ -903,7 +903,7 @@
+ 	$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
+ 
+ libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
+-	 $(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
++	 $(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
+ 
+ 
+ libpython$(VERSION).sl: $(LIBRARY_OBJS)