diff options
author | jmmv <jmmv@pkgsrc.org> | 2012-10-09 01:07:55 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2012-10-09 01:07:55 +0000 |
commit | 577b890de0af52c36b491598b102ad0bd2d67f0b (patch) | |
tree | 54202fc3610b91ce865533a51038d28fd1499b16 | |
parent | c98029861a5f31d71c927995bed16ef6925dadae (diff) | |
download | pkgsrc-577b890de0af52c36b491598b102ad0bd2d67f0b.tar.gz |
Fix build under NetBSD/macppc.
-rw-r--r-- | devel/libffi/distinfo | 3 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ak | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index 06f41570aff..10561dc0382 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2012/09/14 23:45:27 asau Exp $ +$NetBSD: distinfo,v 1.23 2012/10/09 01:07:55 jmmv Exp $ SHA1 (libffi-3.0.11.tar.gz) = bff6a6c886f90ad5e30dee0b46676e8e0297d81d RMD160 (libffi-3.0.11.tar.gz) = 2495e499b63bed7e334ea15979f2eb24ed12ef9a @@ -12,4 +12,5 @@ SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2 SHA1 (patch-ah) = e9580069ede90cd616da7bc230b28acbf5d204a6 SHA1 (patch-ai) = f85a6cb64d4a9d7c3e56b47b7092fce10a744b5b SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153 +SHA1 (patch-ak) = 2dcd80ef62cf5c8df71f0a0424de86586ade6a62 SHA1 (patch-fficonfig.h.in) = fd85fa767bc057c843ff71cc61bedfcff84def43 diff --git a/devel/libffi/patches/patch-ak b/devel/libffi/patches/patch-ak new file mode 100644 index 00000000000..9263b93531d --- /dev/null +++ b/devel/libffi/patches/patch-ak @@ -0,0 +1,19 @@ +$NetBSD: patch-ak,v 1.1 2012/10/09 01:07:55 jmmv Exp $ + +Avoid a duplicate case statement under powerpc, as the FFI_TYPE_LONGDOUBLE +and FFI_TYPE_DOUBLE constants are defined to the same value. + +--- src/powerpc/ffi.c.orig 2012-04-12 02:46:06.000000000 +0000 ++++ src/powerpc/ffi.c +@@ -664,9 +664,11 @@ ffi_prep_cif_machdep (ffi_cif *cif) + switch (type) + { + #ifndef __NO_FPRS__ ++#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE + case FFI_TYPE_LONGDOUBLE: + flags |= FLAG_RETURNS_128BITS; + /* Fall through. */ ++#endif + case FFI_TYPE_DOUBLE: + flags |= FLAG_RETURNS_64BITS; + /* Fall through. */ |