<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/313ed2317d1360afb4a960cba3b51d8beb7464f5">https://github.com/macports/macports-ports/commit/313ed2317d1360afb4a960cba3b51d8beb7464f5</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 313ed2317d1 libffi: update to 3.4.8
</span>313ed2317d1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 313ed2317d1360afb4a960cba3b51d8beb7464f5
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Thu Apr 17 17:51:47 2025 -0700
<span style='display:block; white-space:pre;color:#404040;'> libffi: update to 3.4.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As usual, the patchfile is derived from git differences, which no
</span><span style='display:block; white-space:pre;color:#404040;'> longer include the now-upstream fix for the build problem on Sequoia.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As usual, there are many test failures, but 3.4.8 is roughly
</span><span style='display:block; white-space:pre;color:#404040;'> comparable to 3.4.6 in this regard.
</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;'> Tested -/+universal on 10.4-10.5 ppc, 10.5-10.6 ppc (i386 Rosetta),
</span><span style='display:block; white-space:pre;color:#404040;'> 10.4-10.6 i386, 10.4-12.x x86_64, and 11.x-15.x arm64.
</span>---
devel/libffi/Portfile | 18 +++++--------
devel/libffi/files/patch-sources.diff | 48 ++++++-----------------------------
2 files changed, 14 insertions(+), 52 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 a35e2550ca5..0ea9be02dde 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;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libffi libffi 3.4.6 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libffi libffi 3.4.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8e927f6bc340564414a87cc5b6dffc9ce53eefd8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1391684
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ea8558bf3afdf92f470859807a31c6dc78921d0e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bc9842a18898bfacb0ed1252c4febcc7e78fa139fd27fdc7a3e30d9d9356119b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1397992
</span>
github.tarball_from releases
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +31,7 @@ homepage https://www.sourceware.org/libffi/
</span>
# patch-sources.diff: fixes for various issues.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This includes one upstream fix for a build problem on Sequoia. Although
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 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:#ffe0e0;'>-# so for now we just cherry-pick the needed change.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This diff is from v3.4.6 vs. macports-3.4.6r2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This diff is from v3.4.8 vs. macports-3.4.8.
</span> #
patchfiles patch-sources.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +61,6 @@ platform darwin {
</span> # target architecture to get the correct build. Merely providing the
# correct architecture options in xxFLAGS is insufficient.
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is a more general fix than the former fix for 10.6/ppc/Rosetta
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span> if { [variant_isset universal] } {
merger_arch_compiler yes
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libffi/files/patch-sources.diff b/devel/libffi/files/patch-sources.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 23a765d6a25..fc5845d559c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libffi/files/patch-sources.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,37 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/aarch64/sysv.S.orig 2024-02-15 04:54:35.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/aarch64/sysv.S 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,8 +89,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- x5 closure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CNAME(ffi_call_SYSV):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BTI_C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Sign the lr with x1 since that is where it will be stored */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIGN_LR_WITH_REG(x1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,8 +347,8 @@ CNAME(ffi_closure_SYSV_V):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .align 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CNAME(ffi_closure_SYSV):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BTI_C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SIGN_LR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -643,8 +643,8 @@ CNAME(ffi_go_closure_SYSV_V):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .align 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CNAME(ffi_go_closure_SYSV):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cfi_startproc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BTI_C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stp x29, x30, [sp, #-ffi_closure_SYSV_FS]!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/powerpc/darwin.S.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin.S 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/powerpc/darwin.S.orig 2024-06-01 10:42:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin.S 2025-04-17 11:40:54.000000000 -0700
</span> @@ -31,8 +31,6 @@
#define MODE_CHOICE(x, y) x
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +9,8 @@
</span> ; Define some pseudo-opcodes for size-independent load & store of GPRs ...
#define lgu MODE_CHOICE(lwzu, ldu)
#define lg MODE_CHOICE(lwz,ld)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/powerpc/darwin_closure.S.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/powerpc/darwin_closure.S 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/powerpc/darwin_closure.S.orig 2024-06-01 10:42:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/powerpc/darwin_closure.S 2025-04-17 11:40:54.000000000 -0700
</span> @@ -34,7 +34,7 @@
#define MODE_CHOICE(x, y) x
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +20,8 @@
</span>
; Define some pseudo-opcodes for size-independent load & store of GPRs ...
#define lgu MODE_CHOICE(lwzu, ldu)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- testsuite/lib/libffi.exp.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ testsuite/lib/libffi.exp 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- testsuite/lib/libffi.exp.orig 2024-06-01 10:42:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/lib/libffi.exp 2025-04-17 11:40:54.000000000 -0700
</span> @@ -516,7 +516,10 @@ proc run-many-tests { testcases extra_fl
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +34,8 @@
</span> if [info exists env(LIBFFI_TEST_OPTIMIZATION)] {
set optimizations [ list $env(LIBFFI_TEST_OPTIMIZATION) ]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- testsuite/libffi.bhaible/bhaible.exp.orig 2023-03-15 07:19:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ testsuite/libffi.bhaible/bhaible.exp 2025-04-06 16:16:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- testsuite/libffi.bhaible/bhaible.exp.orig 2024-06-01 10:42:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ testsuite/libffi.bhaible/bhaible.exp 2025-04-17 11:40:54.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>