From d0bb4107b723b7bb0aee7c06cd8fef1da8393c20 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sat, 3 Jul 2021 09:19:43 +0000
Subject: [PATCH] libffi: Fix ABI issues with 3.4.2

---
 extra/libffi/build   | 11 +++++++++--
 extra/libffi/version |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/extra/libffi/build b/extra/libffi/build
index b2747a3d..e2cebf19 100755
--- a/extra/libffi/build
+++ b/extra/libffi/build
@@ -2,6 +2,7 @@
 
 ./configure \
     --prefix=/usr \
+    --disable-exec-static-tramp \
     --with-pic
 
 make
@@ -11,7 +12,13 @@ make DESTDIR="$1" install
 # for rebuilds of all packages linking to
 # libffi.
 #
-# ABI incompatibility only affects AArch64.
+# ABI incompatibility (6 -> 7) only affects AArch64.
 # See: https://github.com/libffi/libffi/commit/c02c341
 #      https://github.com/libffi/libffi/issues/528
-ln -s libffi.so.7 "$1/usr/lib/libffi.so.6"
+#
+# ABI incompatibility (7 -> 8) only effects
+# --enable-exec-static-tramp (which is default).
+# See: https://sourceware.org/pipermail/libffi-discuss/2021/002644.html
+#      https://github.com/libffi/libffi/pull/647
+ln -sf libffi.so.7 "$1/usr/lib/libffi.so.6"
+ln -sf libffi.so.8 "$1/usr/lib/libffi.so.7"
diff --git a/extra/libffi/version b/extra/libffi/version
index 7675fd4a..ddd85e56 100644
--- a/extra/libffi/version
+++ b/extra/libffi/version
@@ -1 +1 @@
-3.4.2 1
+3.4.2 2