head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.2 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.1.0.4 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.2; locks; strict; comment @# @; 1.2 date 2013.03.14.19.56.41; author drochner; state dead; branches; next 1.1; 1.1 date 2012.10.09.01.07.55; author jmmv; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2012.10.09.01.07.55; author tron; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2012.11.15.15.50.10; author tron; state Exp; branches; next ; desc @@ 1.2 log @update to 3.0.12 changes: -bugfixes -more compilers/CPUs supported @ text @$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. */ @ 1.1 log @Fix build under NetBSD/macppc. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-ak was added on branch pkgsrc-2012Q3 on 2012-11-15 15:50:10 +0000 @ text @d1 19 @ 1.1.2.2 log @Pullup ticket #3969 - requested by he devel/libffi: build fix Revisions pulled up: - devel/libffi/distinfo 1.23 - devel/libffi/patches/patch-ak 1.1 --- Module Name: pkgsrc Committed By: jmmv Date: Tue Oct 9 01:07:56 UTC 2012 Modified Files: pkgsrc/devel/libffi: distinfo Added Files: pkgsrc/devel/libffi/patches: patch-ak Log Message: Fix build under NetBSD/macppc. @ text @a0 19 $NetBSD$ 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. */ @