[pkgsrc/trunk]: pkgsrc/devel/libffi Disable incompatible assembly sections on...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20120b1902ad
branches:  trunk
changeset: 648914:20120b1902ad
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Mon Mar 23 15:34:18 2015 +0000

description:
Disable incompatible assembly sections on 32-bit OSX.  Based on MacPorts fix
in http://trac.macports.org/ticket/44170

diffstat:

 devel/libffi/distinfo                      |   3 ++-
 devel/libffi/patches/patch-src_x86_win32.S |  23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r fa28c5d2ae15 -r 20120b1902ad devel/libffi/distinfo
--- a/devel/libffi/distinfo     Mon Mar 23 14:49:53 2015 +0000
+++ b/devel/libffi/distinfo     Mon Mar 23 15:34:18 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2015/01/09 15:10:51 martin Exp $
+$NetBSD: distinfo,v 1.40 2015/03/23 15:34:18 jperkin Exp $
 
 SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6
 RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd
@@ -13,3 +13,4 @@
 SHA1 (patch-src_alpha_osf.S) = 3fa2aab1924bc445fa2f76835c3fd38e5a3898f9
 SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f
 SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077
+SHA1 (patch-src_x86_win32.S) = 8a41cbc7237d6a171605a66e91d8d92a57181569
diff -r fa28c5d2ae15 -r 20120b1902ad devel/libffi/patches/patch-src_x86_win32.S
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libffi/patches/patch-src_x86_win32.S        Mon Mar 23 15:34:18 2015 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_x86_win32.S,v 1.1 2015/03/23 15:34:18 jperkin Exp $
+
+Disable incompatible assembly sections on 32-bit OSX.  Based on MacPorts fix
+in http://trac.macports.org/ticket/44170
+
+--- src/x86/win32.S.orig       2014-11-11 14:41:37.000000000 +0000
++++ src/x86/win32.S
+@@ -1182,6 +1182,7 @@ L_ffi_closure_WIN32_inner$stub:
+         hlt ; hlt ; hlt ; hlt ; hlt
+ #endif
+ 
++#if !defined(X86_DARWIN)
+ #if defined(X86_WIN32) && !defined(__OS2__)
+         .section      .eh_frame,"w"
+ #endif
+@@ -1343,6 +1344,7 @@ L_ffi_closure_WIN32_inner$stub:
+         /* End of DW_CFA_xxx CFI instructions.  */
+         .align 4
+ .LEFDE5:
++#endif /* X86_DARWIN */
+ 
+ #endif /* !_MSC_VER */
+