Include upstream patch to define generic symbols carefully wrt #347636 by Dennis Schridde.

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

4 files changed, 123 insertions, 2 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index c4f88ba0cd8f..ea8c0b31d0ba 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.107 2010/09/20 17:55:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.108 2010/12/18 09:10:53 ssuominen Exp $
+
+*libffi-3.0.9-r1 (18 Dec 2010)
+
+  18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> +libffi-3.0.9-r1.ebuild,
+  +files/libffi-3.0.9-define-generic-symbols-carefully.patch:
+  Include upstream patch to define generic symbols carefully wrt #347636 by
+  Dennis Schridde.
 
   20 Sep 2010; Raúl Porcel <armin76@gentoo.org> libffi-3.0.9.ebuild,
   +files/libffi-3.0.9-arm-oabi.patch:
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index e199eee55de1..7413121952a6 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -2,11 +2,13 @@ AUX libffi-3.0.8-arm.patch 1840 RMD160 2a437a9f900a34e9b7438898f97864c811d87957
 AUX libffi-3.0.8-autoconf-2.64.patch 370 RMD160 4d92f991d6b9ab0b965f310dcd3836c265e52db3 SHA1 9ecb24c97b24cdb2ba0c4e07d339f0826ae0fb53 SHA256 ee184a3830735cf20249279f4929498af6004f89f3dd720cd4cdb1c272917e98
 AUX libffi-3.0.8-fbsd.patch 866 RMD160 ac8c5a157bf3faf5d54ef2bab8822cec5656aaef SHA1 d460fd0a55365f0b4befbdb2c2259399dd875e44 SHA256 5c50d84ba3e6312c046efa5ac8bed0c6b9b719ae98196f7841511f62dccb568d
 AUX libffi-3.0.9-arm-oabi.patch 287 RMD160 047879573e5a8d577fe66530c12d8ceae1d2baf5 SHA1 673d4c1b230adf7497853634adec5b7fcf9d6fe3 SHA256 77d3a62aef0bffba8b99a07bc3b461dea6eb68506d7cd57b762fa28f3f44cef9
+AUX libffi-3.0.9-define-generic-symbols-carefully.patch 1913 RMD160 5e2219a610259703986b792aa50cefe122c66a34 SHA1 d61a4f6b35eb2fa5bbe7907befd08121f96211bf SHA256 58c39a0feaf7e6beba13b42cb79fbff5d853d75f4c1014899511b3ff37012c9e
 AUX libffi-3.0.9-interix.patch 2456 RMD160 c7d92621a610ace2730da00f070db8b6b240355b SHA1 85b56c85218fd42d86c3b5ddccad7fb421892589 SHA256 ecf5e44ae756929d0edf9f5c50682e4e23684ff90955ad454fd9cf087c849c8c
 AUX libffi-3.0.9-irix.patch 1516 RMD160 0e7ecd3d857899972733375943bc1268aa92c2d5 SHA1 46ef3e873548761db84ef8738a60c3af45e0164c SHA256 b5b44a871c387e88ee66b27af1ea768342debc3d4b471b4b8665ea9ec2e31bc3
 DIST libffi-3.0.8.tar.gz 722834 RMD160 4144f64e79ebf95161a6afd58ceaeef8372b5e57 SHA1 ce44d10c39d9a37479c8777e206cac0f36c48712 SHA256 2c7c5b88a68fb362262889ba25ef25dc27864b7bbf03547a8a36b8d567569406
 DIST libffi-3.0.9.tar.gz 731719 RMD160 11ff9aeb62f4fbe1fecf09e6f9814a72bfedb37a SHA1 56e41f87780e09d06d279690e53d4ea2c371ea88 SHA256 589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452
 EBUILD libffi-3.0.8.ebuild 1046 RMD160 bef02212f2db72e51c02831cfff1b8fac4b213a4 SHA1 ad7485afe12f864c0bd82feafec54c78a74d24df SHA256 adce8ecd350fa0bea5ef58889ffd93d86e493817f9587b0360923f4b17277eba
+EBUILD libffi-3.0.9-r1.ebuild 1317 RMD160 79a44f66c93c6e29867d1799ee211794cc2d07a6 SHA1 55672dd221a7deb402ae1c2e0c5f12af316bf9b5 SHA256 30bdf3bb7deda572c2be178ce550ed5919530e18adf7ed3063f5be914da0af1c
 EBUILD libffi-3.0.9.ebuild 1241 RMD160 65dae7ee8f9e173433b4c03f2e12b735a32918e9 SHA1 99153a28229846f0737a38d28efb9af2a9c9840a SHA256 d2f4ad38e4c2c4010974a1893c72462dde9accc7eecc2532f70076ac5bb63d63
-MISC ChangeLog 14474 RMD160 acd9506bbd936a44b0e153ea23bb45bf47288f7a SHA1 dfa5a88c1d3570697adf0336634c9c48691a3e11 SHA256 59548b69c4495a2bbdfd68cd0b68ecff5e483125d13adf478dfd299fce4d7f53
+MISC ChangeLog 14745 RMD160 9917455c44e0155650038b3cbf7eb9b9571e7fcd SHA1 caff2590591d8c6c4d4a9375e564f07c3fd5f996 SHA256 1f26d24c450f4a1c12469a833360ae9bc0c1e19e848f6513ec64da1ec63ea01b
 MISC metadata.xml 1663 RMD160 d2ead0beb5a34033489150623558bbe4e0083516 SHA1 8a54e9af62c01a17431ee8359edbe1d35099d3c3 SHA256 f03f0b55cdf4405ead462ba1c1b8ff2f1b6821c22c3f23d484490f8c875f6073
diff --git a/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch b/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch
new file mode 100644
index 000000000000..1fd6aace4950
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.0.9-define-generic-symbols-carefully.patch
@@ -0,0 +1,69 @@
+http://bugs.gentoo.org/347636
+
+Index: libffi/include/ffi.h.in
+===================================================================
+--- libffi.orig/include/ffi.h.in
++++ libffi/include/ffi.h.in
+@@ -57,7 +57,9 @@ extern "C" {
+ #endif
+ 
+ /* Specify which architecture libffi is configured for. */
++#ifndef @TARGET@
+ #define @TARGET@
++#endif
+ 
+ /* ---- System configuration information --------------------------------- */
+ 
+Index: libffi/src/powerpc/ffitarget.h
+===================================================================
+--- libffi.orig/src/powerpc/ffitarget.h
++++ libffi/src/powerpc/ffitarget.h
+@@ -31,12 +31,18 @@
+ /* ---- System specific configurations ----------------------------------- */
+ 
+ #if defined (POWERPC) && defined (__powerpc64__)	/* linux64 */
++#ifndef POWERPC64
+ #define POWERPC64
++#endif
+ #elif defined (POWERPC_DARWIN) && defined (__ppc64__)	/* Darwin */
++#ifndef POWERPC64
+ #define POWERPC64
++#endif
+ #elif defined (POWERPC_AIX) && defined (__64BIT__)	/* AIX64 */
++#ifndef POWERPC64
+ #define POWERPC64
+ #endif
++#endif
+ 
+ #ifndef LIBFFI_ASM
+ typedef unsigned long          ffi_arg;
+Index: libffi/src/s390/ffitarget.h
+===================================================================
+--- libffi.orig/src/s390/ffitarget.h
++++ libffi/src/s390/ffitarget.h
+@@ -28,8 +28,10 @@
+ #define LIBFFI_TARGET_H
+ 
+ #if defined (__s390x__)
++#ifndef S390X
+ #define S390X
+ #endif
++#endif
+ 
+ /* ---- System specific configurations ----------------------------------- */
+ 
+Index: libffi/src/sparc/ffitarget.h
+===================================================================
+--- libffi.orig/src/sparc/ffitarget.h
++++ libffi/src/sparc/ffitarget.h
+@@ -30,8 +30,10 @@
+ /* ---- System specific configurations ----------------------------------- */
+ 
+ #if defined(__arch64__) || defined(__sparcv9)
++#ifndef SPARC64
+ #define SPARC64
+ #endif
++#endif
+ 
+ #ifndef LIBFFI_ASM
+ typedef unsigned long          ffi_arg;
diff --git a/dev-libs/libffi/libffi-3.0.9-r1.ebuild b/dev-libs/libffi/libffi-3.0.9-r1.ebuild
new file mode 100644
index 000000000000..e677e8c6d33a
--- /dev/null
+++ b/dev-libs/libffi/libffi-3.0.9-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.9-r1.ebuild,v 1.1 2010/12/18 09:10:53 ssuominen Exp $
+
+inherit eutils libtool
+
+DESCRIPTION="a portable, high level programming interface to various calling conventions."
+HOMEPAGE="http://sourceware.org/libffi/"
+SRC_URI="ftp://sourceware.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+RDEPEND=""
+DEPEND="test? ( dev-util/dejagnu )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-irix.patch \
+		"${FILESDIR}"/${P}-arm-oabi.patch \
+		"${FILESDIR}"/${P}-define-generic-symbols-carefully.patch
+
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable debug)
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog* README
+	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
+}