summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorseb <seb@pkgsrc.org>2009-09-21 00:33:51 +0000
committerseb <seb@pkgsrc.org>2009-09-21 00:33:51 +0000
commitc3d4f12d14d8e1d5e4c01b7fb35f6571e780a271 (patch)
tree7e85bcc5ed3575e59ab366f1160406d46f9fad06 /devel
parent66d317407131221211cc98acd5a40cd67ecdff3e (diff)
downloadpkgsrc-c3d4f12d14d8e1d5e4c01b7fb35f6571e780a271.tar.gz
Fix build with sunpro's cc which defines __i386 but not __i386__
Diffstat (limited to 'devel')
-rw-r--r--devel/libffi/distinfo3
-rw-r--r--devel/libffi/patches/patch-ab17
2 files changed, 19 insertions, 1 deletions
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo
index 3a17e23e720..8dae63245c3 100644
--- a/devel/libffi/distinfo
+++ b/devel/libffi/distinfo
@@ -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 --git a/devel/libffi/patches/patch-ab b/devel/libffi/patches/patch-ab
new file mode 100644
index 00000000000..a7d54b91353
--- /dev/null
+++ b/devel/libffi/patches/patch-ab
@@ -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,