CVS commit: pkgsrc/devel/libffi

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Feb 28 15:44:36 UTC 2020

Modified Files:
        pkgsrc/devel/libffi: distinfo
Added Files:
        pkgsrc/devel/libffi/patches: patch-include_ffi__common.h

Log Message:
libffi: deal with fallout on aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libffi/patches/patch-include_ffi__common.h

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/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.46 pkgsrc/devel/libffi/distinfo:1.47
--- pkgsrc/devel/libffi/distinfo:1.46   Wed Feb 26 19:15:44 2020
+++ pkgsrc/devel/libffi/distinfo        Fri Feb 28 15:44:36 2020
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.46 2020/02/26 19:15:44 adam Exp $
+$NetBSD: distinfo,v 1.47 2020/02/28 15:44:36 tnn Exp $
 
 SHA1 (libffi-3.3.tar.gz) = 8df6cb570c8d6596a67d1c0773bf00650154f7aa
 RMD160 (libffi-3.3.tar.gz) = 2cd43b66d792f1bad76df2e19a8411beacfcb8e0
 SHA512 (libffi-3.3.tar.gz) = 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
 Size (libffi-3.3.tar.gz) = 1305466 bytes
 SHA1 (patch-configure) = 81f1f2bee39a40f2a34b3a6cea0b210d13037482
+SHA1 (patch-include_ffi__common.h) = 78bece09f313ea760137a315ffc03ea53f529758
 SHA1 (patch-src_m68k_ffi.c) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
 SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc
 SHA1 (patch-src_mips_ffi.c) = 7353f68f73917af6bff0b90393ac3404ea54fb99

Added files:

Index: pkgsrc/devel/libffi/patches/patch-include_ffi__common.h
diff -u /dev/null pkgsrc/devel/libffi/patches/patch-include_ffi__common.h:1.1
--- /dev/null   Fri Feb 28 15:44:36 2020
+++ pkgsrc/devel/libffi/patches/patch-include_ffi__common.h     Fri Feb 28 15:44:36 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-include_ffi__common.h,v 1.1 2020/02/28 15:44:36 tnn Exp $
+
+Declaring ffi_data_to_code_pointer as FFI_HIDDEN is redundant because an
+ld script is used. It also breaks the build on aarch64:
+
+/usr/bin/ld: src/aarch64/.libs/ffi.o: in function `ffi_prep_closure_loc':
+ffi.c:(.text+0x6ac): undefined reference to `ffi_data_to_code_pointer'
+/usr/bin/ld: .libs/libffi.so.7.1.0: hidden symbol `ffi_data_to_code_pointer' isn't defined
+/usr/bin/ld: final link failed: bad value
+
+--- include/ffi_common.h.orig  2019-10-31 14:49:54.000000000 +0000
++++ include/ffi_common.h
+@@ -101,7 +101,7 @@ ffi_status ffi_prep_cif_core(ffi_cif *ci
+ 
+ /* Translate a data pointer to a code pointer.  Needed for closures on
+    some targets.  */
+-void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN;
++void *ffi_data_to_code_pointer (void *data);
+ 
+ /* Extended cif, used in callback from assembly routine */
+ typedef struct