[pkgsrc/trunk]: pkgsrc/devel/libffi Fix build with sunpro's cc which defines ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5801160a826f
branches:  trunk
changeset: 399502:5801160a826f
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Sep 21 00:33:51 2009 +0000

description:
Fix build with sunpro's cc which defines __i386 but not __i386__

diffstat:

 devel/libffi/distinfo         |   3 ++-
 devel/libffi/patches/patch-ab |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 839aa06be9dc -r 5801160a826f devel/libffi/distinfo
--- a/devel/libffi/distinfo     Sun Sep 20 21:40:37 2009 +0000
+++ b/devel/libffi/distinfo     Mon Sep 21 00:33:51 2009 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2009/09/20 13:10:30 tnn Exp $
+$NetBSD: distinfo,v 1.14 2009/09/21 00:33:51 seb Exp $
 
 SHA1 (libffi-3.0.8.tar.gz) = ce44d10c39d9a37479c8777e206cac0f36c48712
 RMD160 (libffi-3.0.8.tar.gz) = 4144f64e79ebf95161a6afd58ceaeef8372b5e57
 Size (libffi-3.0.8.tar.gz) = 722834 bytes
 SHA1 (patch-aa) = 6020adaf5c9ab0f6de94f930214fa1d726fe8717
+SHA1 (patch-ab) = deeaf203d807db40357e5650523a8d02f469217d
 SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30
 SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
 SHA1 (patch-ae) = d3cbb4e3e00e0b7ced9cd50198da0772f6c73111
diff -r 839aa06be9dc -r 5801160a826f devel/libffi/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libffi/patches/patch-ab     Mon Sep 21 00:33:51 2009 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2009/09/21 00:33:51 seb Exp $
+
+--- src/x86/ffitarget.h.orig   2008-02-14 17:24:06.000000000 -0800
++++ src/x86/ffitarget.h
+@@ -54,10 +54,10 @@ typedef enum ffi_abi {
+ #endif
+ 
+   /* ---- Intel x86 and AMD x86-64 - */
+-#if !defined(X86_WIN32) && (defined(__i386__) || defined(__x86_64__))
++#if !defined(X86_WIN32) && (defined(__i386__) || defined(__i386) || defined(__x86_64__))
+   FFI_SYSV,
+   FFI_UNIX64,   /* Unix variants all use the same ABI for x86-64  */
+-#ifdef __i386__
++#if defined(__i386__) || defined(__i386)
+   FFI_DEFAULT_ABI = FFI_SYSV,
+ #else
+   FFI_DEFAULT_ABI = FFI_UNIX64,