diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-03-23 15:34:18 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-03-23 15:34:18 +0000 |
| commit | c85382df8039031c1f475b50b45c5b2c418959bf (patch) | |
| tree | fb92ece2139cc40b69211bb817d7a5a93c29e03d | |
| parent | 69dc983ecd891a6359b3c4521137cb72b01a4b1e (diff) | |
| download | pkgsrc-c85382df8039031c1f475b50b45c5b2c418959bf.tar.gz | |
Disable incompatible assembly sections on 32-bit OSX. Based on MacPorts fix
in http://trac.macports.org/ticket/44170
| -rw-r--r-- | devel/libffi/distinfo | 3 | ||||
| -rw-r--r-- | devel/libffi/patches/patch-src_x86_win32.S | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index b5be4b90045..79358dc749c 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -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-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153 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 --git a/devel/libffi/patches/patch-src_x86_win32.S b/devel/libffi/patches/patch-src_x86_win32.S new file mode 100644 index 00000000000..eee7b8c06e8 --- /dev/null +++ b/devel/libffi/patches/patch-src_x86_win32.S @@ -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 */ + |