unix: set _PYTHON_HOST_PLATFORM when targeting x86_64-apple-darwin

When commit a7fc6cf (#150) unbusted
aarch64 -> x86-64 cross-compilation on macOS, the produced distributions
failed validation because the sysconfig reported platform tag was wrong.

We extend our existing configure patch to handle the x86_64-apple-darwin
target to ensure the platform tag is defined correctly.

As part of this we refresh the entire patch against the CPython 3.11.
Fortunately it still appears to apply on older Python versions.

Author: indygreg

cpython-unix/patch-apple-cross.patch

@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index cc69015b10..9592ec3877 100644
+index c62a565eb6..f39de9f98c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -400,6 +400,15 @@ then
+@@ -545,6 +545,15 @@ then
  	*-*-cygwin*)
  		ac_sys_system=Cygwin
  		;;
@@ -18,7 +18,7 @@ index cc69015b10..9592ec3877 100644
  	*-*-vxworks*)
  	    ac_sys_system=VxWorks
  	    ;;
-@@ -449,6 +458,19 @@ if test "$cross_compiling" = yes; then
+@@ -600,6 +609,19 @@ if test "$cross_compiling" = yes; then
  	*-*-cygwin*)
  		_host_cpu=
  		;;
@@ -38,7 +38,7 @@ index cc69015b10..9592ec3877 100644
  	*-*-vxworks*)
  		_host_cpu=$host_cpu
  		;;
-@@ -457,7 +479,21 @@ if test "$cross_compiling" = yes; then
+@@ -611,7 +633,24 @@ if test "$cross_compiling" = yes; then
  		MACHDEP="unknown"
  		AC_MSG_ERROR([cross build not supported for $host])
  	esac
@@ -55,13 +55,16 @@ index cc69015b10..9592ec3877 100644
 +	  aarch64-apple-darwin*)
 +	    _PYTHON_HOST_PLATFORM="macosx-${MACOSX_DEPLOYMENT_TARGET}-arm64"
 +	    ;;
++	  x86_64-apple-darwin*)
++	    _PYTHON_HOST_PLATFORM="macosx-${MACOSX_DEPLOYMENT_TARGET}-x86_64"
++	    ;;
 +	  *)
 +	    _PYTHON_HOST_PLATFORM="$MACHDEP${_host_cpu:+-$_host_cpu}"
 +	esac
  fi
 
  # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
-@@ -1171,7 +1207,7 @@ if test $enable_shared = "yes"; then
+@@ -1507,7 +1546,7 @@ if test $enable_shared = "yes"; then
  	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
  	  RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
  	  ;;
@@ -70,7 +73,7 @@ index cc69015b10..9592ec3877 100644
      	LDLIBRARY='libpython$(LDVERSION).dylib'
  	BLDLIBRARY='-L. -lpython$(LDVERSION)'
  	RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
-@@ -1209,15 +1245,6 @@ then
+@@ -1626,15 +1665,6 @@ then
  fi
 
  AC_CHECK_TOOLS([READELF], [readelf], [:])
@@ -86,8 +89,8 @@ index cc69015b10..9592ec3877 100644
 
  case $MACHDEP in
  hp*|HP*)
-@@ -2715,6 +2742,11 @@ then
- 	Linux*|GNU*|QNX*|VxWorks*)
+@@ -3173,6 +3203,11 @@ then
+ 	Linux*|GNU*|QNX*|VxWorks*|Haiku*)
  		LDSHARED='$(CC) -shared'
  		LDCXXSHARED='$(CXX) -shared';;
 +	iOS*|tvOS*|watchOS*)