CVS commit: pkgsrc/devel/libffi

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jun 22 21:52:58 UTC 2026

Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
Added Files:
        pkgsrc/devel/libffi/patches: patch-testsuite_lib_libffi.exp

Log Message:
libffi: add upstream patch fixing the two broken tests


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libffi/patches/patch-testsuite_lib_libffi.exp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libffi/Makefile
diff -u pkgsrc/devel/libffi/Makefile:1.58 pkgsrc/devel/libffi/Makefile:1.59
--- pkgsrc/devel/libffi/Makefile:1.58   Mon Jun 22 19:35:16 2026
+++ pkgsrc/devel/libffi/Makefile        Mon Jun 22 21:52:58 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2026/06/22 19:35:16 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2026/06/22 21:52:58 wiz Exp $
 
 DISTNAME=      libffi-3.6.0
 CATEGORIES=    devel
@@ -22,11 +22,6 @@ INFO_FILES=          yes
 TEST_DEPENDS+=         dejagnu-[0-9]*:../../devel/dejagnu
 TEST_TARGET=           check
 
-# as of 3.6.0
-# of expected passes            2456
-# of unexpected failures        2
-# of unresolved testcases       2
-
 .include "../../mk/compiler.mk"
 # The Compaq C frontend groks .s, but not .S. Assemble osf.S directly w/ as(1).
 pre-build:

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.69 pkgsrc/devel/libffi/distinfo:1.70
--- pkgsrc/devel/libffi/distinfo:1.69   Mon Jun 22 19:35:16 2026
+++ pkgsrc/devel/libffi/distinfo        Mon Jun 22 21:52:58 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2026/06/22 19:35:16 wiz Exp $
+$NetBSD: distinfo,v 1.70 2026/06/22 21:52:58 wiz Exp $
 
 BLAKE2s (libffi-3.6.0.tar.gz) = 9144acf66819d80cd98eb0cf547d60a4d4b2b86c5a01ec81a874595c9e5c464b
 SHA512 (libffi-3.6.0.tar.gz) = 716f0e7884cd7206ceb7410a8422a0c2229bf48151ff525575f7489d389683531bd0c6cf8c78a3a5f9c54444ef485a7f2b0e1e6e4180b4da599dec9021a40491
@@ -14,4 +14,5 @@ SHA1 (patch-src_mips_ffi.c) = 1fa75056b3
 SHA1 (patch-src_mips_ffitarget.h) = 8e743e89bdc6de977d503a516bdcde44db233b7a
 SHA1 (patch-src_powerpc_ffi.c) = b68a93d0f8552efaa8c50256da3af3bde5de7059
 SHA1 (patch-src_powerpc_ffi__powerpc.h) = fafb125b28069d5108726ac7b2d4efdc4fdadf92
+SHA1 (patch-testsuite_lib_libffi.exp) = 2cebc793178f7f4adc873cdfccc248dff209428d
 SHA1 (patch-testsuite_libffi.call_float2.c) = 2a42a428b0cc55065968c7f0748026da12b70b9d

Added files:

Index: pkgsrc/devel/libffi/patches/patch-testsuite_lib_libffi.exp
diff -u /dev/null pkgsrc/devel/libffi/patches/patch-testsuite_lib_libffi.exp:1.1
--- /dev/null   Mon Jun 22 21:52:58 2026
+++ pkgsrc/devel/libffi/patches/patch-testsuite_lib_libffi.exp  Mon Jun 22 21:52:58 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-testsuite_lib_libffi.exp,v 1.1 2026/06/22 21:52:58 wiz Exp $
+
+testsuite: link threads tests against libpthread on NetBSD
+The libffi.threads/tsan.c test calls pthread_create but the harness
+only appended -lpthread for OpenBSD, FreeBSD, and some Linux targets.
+On NetBSD this caused an undefined reference to pthread_create.
+
+Fixes #988
+
+https://github.com/libffi/libffi/commit/c93f9428d17cde4eb35517b58feeae6fb43aba5b
+
+--- testsuite/lib/libffi.exp.orig      2026-06-20 13:58:53.000000000 +0000
++++ testsuite/lib/libffi.exp
+@@ -411,6 +411,10 @@ proc libffi_target_compile { source dest type options 
+             lappend options "libs= -lpthread"
+         }
+ 
++        if { [string match "*-*-netbsd*" $target_triplet] } {
++            lappend options "libs= -lpthread"
++        }
++
+         lappend options "libs= -lffi"
+ 
+         if { [string match "aarch64*-*-linux*" $target_triplet] } {