pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libffi Back out previous patch.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/167f44325c7c
branches:  trunk
changeset: 423857:167f44325c7c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Feb 28 16:36:14 2020 +0000

description:
Back out previous patch.

Although it made the package link, python is still broken on aarch64:

*** WARNING: renaming "_ctypes" since importing it failed: /usr/pkg/lib/libffi.so.7: Undefined PLT symbol "ffi_data_to_code_pointer" (symnum = 50)

diffstat:

 devel/libffi/distinfo                            |   3 +--
 devel/libffi/patches/patch-include_ffi__common.h |  21 ---------------------
 2 files changed, 1 insertions(+), 23 deletions(-)

diffs (41 lines):

diff -r 9cfd43c0c5c1 -r 167f44325c7c devel/libffi/distinfo
--- a/devel/libffi/distinfo     Fri Feb 28 15:44:36 2020 +0000
+++ b/devel/libffi/distinfo     Fri Feb 28 16:36:14 2020 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.47 2020/02/28 15:44:36 tnn Exp $
+$NetBSD: distinfo,v 1.48 2020/02/28 16:36:14 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
diff -r 9cfd43c0c5c1 -r 167f44325c7c devel/libffi/patches/patch-include_ffi__common.h
--- a/devel/libffi/patches/patch-include_ffi__common.h  Fri Feb 28 15:44:36 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$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



Home | Main Index | Thread Index | Old Index