<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92b7d9d8faf6646a3fae6f5067339a70f2aee4c8">https://github.com/macports/macports-ports/commit/92b7d9d8faf6646a3fae6f5067339a70f2aee4c8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 92b7d9d8faf libffi: Fix build on Sequoia.
</span>92b7d9d8faf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92b7d9d8faf6646a3fae6f5067339a70f2aee4c8
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sun Apr 6 19:05:58 2025 -0700
<span style='display:block; white-space:pre;color:#404040;'> libffi: Fix build on Sequoia.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This cherry-picks an upstream fix for a build problem with a recent
</span><span style='display:block; white-space:pre;color:#404040;'> clang. Although the fix is included in v3.4.7, the latter has
</span><span style='display:block; white-space:pre;color:#404040;'> significantly more test failures than v3.4.6. Until that is
</span><span style='display:block; white-space:pre;color:#404040;'> investigated further, we stay on v3.4.6 with the cherry-picked fix, to
</span><span style='display:block; white-space:pre;color:#404040;'> avoid a possible functional regression.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Due to the (admittedly unlikely) possibility that this changes the
</span><span style='display:block; white-space:pre;color:#404040;'> installed content, it includes a revbump, which is not very expensive
</span><span style='display:block; white-space:pre;color:#404040;'> for this particular port. No revbumping of dependents is needed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/72271
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The unified patchfile is also renamed with a more generic name.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Successfuly built -/+universal on 10.4-10.5 ppc, 10.5-10.6 ppc (i386
</span><span style='display:block; white-space:pre;color:#404040;'> Rosetta), 10.4-10.6 i386, 10.4-12.x x86_64, and 11.x-15.x arm64.
</span><span style='display:block; white-space:pre;color:#404040;'> Tests not included due to many known failures.
</span>---
devel/libffi/Portfile | 16 +++++++--
...tch-pre-snowleopard.diff => patch-sources.diff} | 40 +++++++++++++++++++---
2 files changed, 50 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/Portfile b/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0050876e593..a35e2550ca5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libffi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span> PortGroup github 1.0
github.setup libffi libffi 3.4.6 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
checksums rmd160 8e927f6bc340564414a87cc5b6dffc9ce53eefd8 \
sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,19 @@ long_description The libffi library provides a portable, high level \
</span>
homepage https://www.sourceware.org/libffi/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-pre-snowleopard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches derived from MacPorts-enhanced GitHub fork at
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# github.com/fhgwright/libffi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-sources.diff: fixes for various issues.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This includes one upstream fix for a build problem on Sequoia. Although
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# v3.4.7 includes this fix, it also has more test failures than v3.4.6,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# so for now we just cherry-pick the needed change.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3.4.6 vs. macports-3.4.6r2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-sources.diff
</span>
# Don't use macports gcc or clang toolchains to build this due to dependency cycles
compiler.blacklist-append macports-*
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/patch-pre-snowleopard.diff b/devel/libffi/files/patch-sources.diff
</span>similarity index 64%
rename from devel/libffi/files/patch-pre-snowleopard.diff
rename to devel/libffi/files/patch-sources.diff
<span style='display:block; white-space:pre;color:#808080;'>index ba78eb9a4d9..23a765d6a25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/files/patch-pre-snowleopard.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libffi/files/patch-sources.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aarch64/sysv.S.orig 2024-02-15 04:54:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aarch64/sysv.S 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,8 +89,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x5 closure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CNAME(ffi_call_SYSV):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BTI_C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Sign the lr with x1 since that is where it will be stored */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SIGN_LR_WITH_REG(x1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,8 +347,8 @@ CNAME(ffi_closure_SYSV_V):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .align 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CNAME(ffi_closure_SYSV):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BTI_C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SIGN_LR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -643,8 +643,8 @@ CNAME(ffi_go_closure_SYSV_V):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .align 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CNAME(ffi_go_closure_SYSV):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cfi_startproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BTI_C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
</span> --- src/powerpc/darwin.S.orig 2023-03-15 07:19:45.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin.S 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin.S 2025-04-06 16:16:17.000000000 -0700
</span> @@ -31,8 +31,6 @@
#define MODE_CHOICE(x, y) x
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +42,7 @@
</span> #define lgu MODE_CHOICE(lwzu, ldu)
#define lg MODE_CHOICE(lwz,ld)
--- src/powerpc/darwin_closure.S.orig 2023-03-15 07:19:45.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin_closure.S 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin_closure.S 2025-04-06 16:16:17.000000000 -0700
</span> @@ -34,7 +34,7 @@
#define MODE_CHOICE(x, y) x
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +53,7 @@
</span> ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
#define lgu MODE_CHOICE(lwzu, ldu)
--- testsuite/lib/libffi.exp.orig 2023-03-15 07:19:45.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ testsuite/lib/libffi.exp 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/lib/libffi.exp 2025-04-06 16:16:17.000000000 -0700
</span> @@ -516,7 +516,10 @@ proc run-many-tests { testcases extra_fl
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +67,7 @@
</span> set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
} else {
--- testsuite/libffi.bhaible/bhaible.exp.orig 2023-03-15 07:19:45.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ testsuite/libffi.bhaible/bhaible.exp 2024-02-26 18:37:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/libffi.bhaible/bhaible.exp 2025-04-06 16:16:17.000000000 -0700
</span> @@ -24,7 +24,10 @@ global compiler_vendor
# was done in a pretty lazy fashion, and requires the use of compiler
# flags to disable warnings for now.
</pre><pre style='margin:0'>
</pre>