CVS commit: [pkgsrc-2020Q1] pkgsrc/devel/libffi

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun May 10 13:29:56 UTC 2020

Modified Files:
        pkgsrc/devel/libffi [pkgsrc-2020Q1]: Makefile distinfo
Added Files:
        pkgsrc/devel/libffi/patches [pkgsrc-2020Q1]: patch-src_arm_sysv.S

Log Message:
Pullup ticket #6187 - requested by tnn
devel/libffi: NetBSD/evbarm build fix

Revisions pulled up:
- devel/libffi/Makefile                                         1.40
- devel/libffi/distinfo                                         1.53
- devel/libffi/patches/patch-src_arm_sysv.S                     1.9

---
   Module Name: pkgsrc
   Committed By:        tnn
   Date:                Wed Apr  8 13:40:11 UTC 2020

   Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
   Added Files:
        pkgsrc/devel/libffi/patches: patch-src_arm_sysv.S

   Log Message:
   libffi: fix ARM build

   Restore ifdef toggling .eh_frame exception unwinding.
   Seems to have been lost in previous update. PR pkg/55107. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.2.1 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.52 -r1.52.2.1 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r0 -r1.9.2.2 pkgsrc/devel/libffi/patches/patch-src_arm_sysv.S

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.39 pkgsrc/devel/libffi/Makefile:1.39.2.1
--- pkgsrc/devel/libffi/Makefile:1.39   Fri Feb 28 22:37:24 2020
+++ pkgsrc/devel/libffi/Makefile        Sun May 10 13:29:55 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2020/02/28 22:37:24 tnn Exp $
+# $NetBSD: Makefile,v 1.39.2.1 2020/05/10 13:29:55 bsiegert Exp $
 
 DISTNAME=      libffi-3.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ftp://sourceware.org/pub/libffi/
 

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.52 pkgsrc/devel/libffi/distinfo:1.52.2.1
--- pkgsrc/devel/libffi/distinfo:1.52   Sat Mar 21 16:08:34 2020
+++ pkgsrc/devel/libffi/distinfo        Sun May 10 13:29:55 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2020/03/21 16:08:34 rin Exp $
+$NetBSD: distinfo,v 1.52.2.1 2020/05/10 13:29:55 bsiegert Exp $
 
 SHA1 (libffi-3.3.tar.gz) = 8df6cb570c8d6596a67d1c0773bf00650154f7aa
 RMD160 (libffi-3.3.tar.gz) = 2cd43b66d792f1bad76df2e19a8411beacfcb8e0
@@ -7,6 +7,7 @@ Size (libffi-3.3.tar.gz) = 1305466 bytes
 SHA1 (patch-configure) = 81f1f2bee39a40f2a34b3a6cea0b210d13037482
 SHA1 (patch-configure_host) = 94678e6c264ee116c339eb92f840909a663f28f7
 SHA1 (patch-src_aarch64_ffi.c) = c5bd73abcb7445b073eb3e61feda212ee3396246
+SHA1 (patch-src_arm_sysv.S) = 9aaa8e12e627d68126fbc4ff02e06ed45c94da1a
 SHA1 (patch-src_closures.c) = f818bd0384f146a17964e2320df1321d8b83ec73
 SHA1 (patch-src_m68k_ffi.c) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
 SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc

Added files:

Index: pkgsrc/devel/libffi/patches/patch-src_arm_sysv.S
diff -u /dev/null pkgsrc/devel/libffi/patches/patch-src_arm_sysv.S:1.9.2.2
--- /dev/null   Sun May 10 13:29:56 2020
+++ pkgsrc/devel/libffi/patches/patch-src_arm_sysv.S    Sun May 10 13:29:55 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_arm_sysv.S,v 1.9.2.2 2020/05/10 13:29:55 bsiegert Exp $
+
+fix: libffi.so: undefined reference to `__aeabi_unwind_cpp_pr0'
+
+--- src/arm/sysv.S.orig        2019-10-31 14:49:54.000000000 +0000
++++ src/arm/sysv.S
+@@ -53,7 +53,7 @@
+ #endif
+ 
+ /* Conditionally compile unwinder directives.  */
+-#ifdef __ARM_EABI__
++#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
+ # define UNWIND(...)  __VA_ARGS__
+ #else
+ # define UNWIND(...)