unix: upgrade libffi 3.3 -> 3.4 (except Linux musl)

On Linux musl, we encounter a missing `linux/limits.h` include.
Possibly from building with ancient Linux headers.

Author: indygreg

cpython-unix/Makefile

@@ -120,6 +120,9 @@ $(OUTDIR)/kbproto-$(KBPROTO_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS
 $(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi-3.3.sh
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi-3.3
 
+$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libffi.sh
+	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libffi
+
 $(OUTDIR)/libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)-$(PACKAGE_SUFFIX).tar: $(PYTHON_DEP_DEPENDS) $(HERE)/build-libpthread-stubs.sh $(OUTDIR)/image-$(DOCKER_IMAGE_BUILD).tar
 	$(RUN_BUILD) --docker-image $(DOCKER_IMAGE_BUILD) libpthread-stubs
 
@@ -274,6 +277,7 @@ PYTHON_DEPENDS := \
     $(if $(NEED_EXPAT),$(OUTDIR)/expat-$(EXPAT_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_LIBEDIT),$(OUTDIR)/libedit-$(LIBEDIT_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_LIBFFI_3_3),$(OUTDIR)/libffi-3.3-$(LIBFFI_3.3_VERSION)-$(PACKAGE_SUFFIX).tar) \
+    $(if $(NEED_LIBFFI),$(OUTDIR)/libffi-$(LIBFFI_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_m4),$(OUTDIR)/m4-$(M4_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_MPDECIMAL),$(OUTDIR)/mpdecimal-$(MPDECIMAL_VERSION)-$(PACKAGE_SUFFIX).tar) \
     $(if $(NEED_NCURSES),$(OUTDIR)/ncurses-$(NCURSES_VERSION)-$(PACKAGE_SUFFIX).tar) \

cpython-unix/build-libffi.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+set -ex
+
+ROOT=`pwd`
+
+export PATH=${TOOLS_PATH}/${TOOLCHAIN}/bin:${TOOLS_PATH}/host/bin:$PATH
+
+tar -xf libffi-${LIBFFI_VERSION}.tar.gz
+
+pushd libffi-${LIBFFI_VERSION}
+
+# Upstream commit ce077e5565366171aa1b4438749b0922fce887a4 to resolve a missing declaration.
+patch -p1 << 'EOF'
+diff --git a/include/ffi_common.h b/include/ffi_common.h
+index 2bd31b0..c53a794 100644
+--- a/include/ffi_common.h
++++ b/include/ffi_common.h
+@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
+    static trampoline. */
+ int ffi_tramp_is_present (void *closure) FFI_HIDDEN;
+
++/* Return a file descriptor of a temporary zero-sized file in a
++   writable and executable filesystem. */
++int open_temp_exec_file(void) FFI_HIDDEN;
++
+ /* Extended cif, used in callback from assembly routine */
+ typedef struct
+ {
+diff --git a/src/tramp.c b/src/tramp.c
+index 7e005b0..5f19b55 100644
+--- a/src/tramp.c
++++ b/src/tramp.c
+@@ -39,6 +39,10 @@
+ #ifdef __linux__
+ #define _GNU_SOURCE 1
+ #endif
++
++#include <ffi.h>
++#include <ffi_common.h>
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+EOF
+
+EXTRA_CONFIGURE=
+
+# mkostemp() was introduced in macOS 10.10 and libffi doesn't have
+# runtime guards for it. So ban the symbol when targeting old macOS.
+if [ "${APPLE_MIN_DEPLOYMENT_TARGET}" = "10.9" ]; then
+    EXTRA_CONFIGURE="${EXTRA_CONFIGURE} ac_cv_func_mkostemp=no"
+fi
+
+CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure \
+    --build=${BUILD_TRIPLE} \
+    --host=${TARGET_TRIPLE} \
+    --prefix=/tools/deps \
+    --disable-shared \
+    ${EXTRA_CONFIGURE}
+
+make -j ${NUM_CPUS}
+make -j ${NUM_CPUS} install DESTDIR=${ROOT}/out

cpython-unix/build.py

@@ -1023,6 +1023,7 @@ def main():
             "inputproto",
             "kbproto",
             "libffi-3.3",
+            "libffi",
             "libpthread-stubs",
             "m4",
             "mpdecimal",

cpython-unix/targets.yml

@@ -92,7 +92,7 @@ aarch64-apple-darwin:
     - autoconf
     - bzip2
     - expat
-    - libffi-3.3
+    - libffi
     - m4
     - mpdecimal
     - openssl-3.0
@@ -136,7 +136,7 @@ aarch64-apple-ios:
     - autoconf
     - bzip2
     - expat
-    - libffi-3.3
+    - libffi
     - m4
     - mpdecimal
     - openssl-3.0
@@ -164,7 +164,7 @@ aarch64-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -242,7 +242,7 @@ armv7-unknown-linux-gnueabi:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -280,7 +280,7 @@ armv7-unknown-linux-gnueabihf:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -324,7 +324,7 @@ i686-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -362,7 +362,7 @@ mips-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -400,7 +400,7 @@ mipsel-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -438,7 +438,7 @@ ppc64le-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -476,7 +476,7 @@ s390x-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -576,7 +576,7 @@ x86_64-apple-darwin:
     - autoconf
     - bzip2
     - expat
-    - libffi-3.3
+    - libffi
     - m4
     - mpdecimal
     - openssl-3.0
@@ -620,7 +620,7 @@ x86_64-apple-ios:
     - autoconf
     - bzip2
     - expat
-    - libffi-3.3
+    - libffi
     - m4
     - mpdecimal
     - openssl-3.0
@@ -732,7 +732,7 @@ x86_64-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -777,7 +777,7 @@ x86_64_v2-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -822,7 +822,7 @@ x86_64_v3-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb
@@ -867,7 +867,7 @@ x86_64_v4-unknown-linux-gnu:
     - bzip2
     - expat
     - libedit
-    - libffi-3.3
+    - libffi
     - libX11
     - libXau
     - libxcb

pythonbuild/downloads.py

@@ -116,7 +116,6 @@
         "licenses": ["BSD-3-Clause"],
         "license_file": "LICENSE.libedit.txt",
     },
-    # libffi 3.4 has trouble building with musl due to Linux headers wonkiness.
     "libffi-3.3": {
         "url": "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz",
         "size": 1305466,
@@ -126,6 +125,15 @@
         "licenses": ["MIT"],
         "license_file": "LICENSE.libffi.txt",
     },
+    "libffi": {
+        "url": "https://github.com/libffi/libffi/releases/download/v3.4.4/libffi-3.4.4.tar.gz",
+        "size": 1362394,
+        "sha256": "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676",
+        "version": "3.4.4",
+        "library_names": ["ffi"],
+        "licenses": ["MIT"],
+        "license_file": "LICENSE.libffi.txt",
+    },
     "libpthread-stubs": {
         "url": "https://www.x.org/archive/individual/lib/libpthread-stubs-0.5.tar.gz",
         "size": 74938,