Allow to compile on 32-bits Darwin, bug #536764

(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

5 files changed, 38 insertions, 7 deletions

diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog
index a605e219f878..89fb8ea5317a 100644
--- a/dev-libs/libffi/ChangeLog
+++ b/dev-libs/libffi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libffi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.198 2015/01/16 12:42:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.199 2015/01/18 19:01:31 grobian Exp $
+
+  18 Jan 2015; Fabian Groffen <grobian@gentoo.org>
+  +files/libffi-3.1-darwin-x32.patch, libffi-3.1-r3.ebuild, libffi-3.2.1.ebuild,
+  libffi-3.2.ebuild:
+  Allow to compile on 32-bits Darwin, bug #536764
 
   16 Jan 2015; Tobias Klausmann <klausman@gentoo.org>
   +files/libffi-3.2.1-complex_alpha.patch, libffi-3.2.1.ebuild:
diff --git a/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
new file mode 100644
index 000000000000..e5f100e56726
--- /dev/null
+++ b/dev-libs/libffi/files/libffi-3.1-darwin-x32.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/show_bug.cgi?id=513428
+https://bugs.gentoo.org/show_bug.cgi?id=536764
+https://trac.macports.org/ticket/44170
+
+--- libffi-3.2.1/src/x86/win32.S
++++ libffi-3.2.1/src/x86/win32.S
+@@ -1184,7 +1184,6 @@
+ 
+ #if defined(X86_WIN32) && !defined(__OS2__)
+         .section	.eh_frame,"w"
+-#endif
+ .Lframe1:
+ .LSCIE1:
+         .long	.LECIE1-.LASCIE1  /* Length of Common Information Entry */
+@@ -1343,6 +1342,7 @@
+         /* End of DW_CFA_xxx CFI instructions.  */
+         .align 4
+ .LEFDE5:
++#endif /* defined(X86_WIN32) && !defined(__OS2__), for the eh_frame */
+ 
+ #endif /* !_MSC_VER */
+ 
diff --git a/dev-libs/libffi/libffi-3.1-r3.ebuild b/dev-libs/libffi/libffi-3.1-r3.ebuild
index 196a04bc965b..6c8f82ea6a70 100644
--- a/dev-libs/libffi/libffi-3.1-r3.ebuild
+++ b/dev-libs/libffi/libffi-3.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild,v 1.2 2014/08/10 20:35:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.1-r3.ebuild,v 1.3 2015/01/18 19:01:31 grobian Exp $
 
 EAPI=5
 inherit eutils libtool multilib multilib-minimal toolchain-funcs
@@ -39,7 +39,8 @@ pkg_setup() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-execstack.patch \
-		"${FILESDIR}"/${P}-typing_error.patch
+		"${FILESDIR}"/${P}-typing_error.patch \
+		"${FILESDIR}"/${P}-darwin-x32.patch
 
 	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 	# http://sourceware.org/ml/libffi-discuss/2014/msg00060.html
diff --git a/dev-libs/libffi/libffi-3.2.1.ebuild b/dev-libs/libffi/libffi-3.2.1.ebuild
index 845aeecbe97c..530b899f0f2a 100644
--- a/dev-libs/libffi/libffi-3.2.1.ebuild
+++ b/dev-libs/libffi/libffi-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.2.1.ebuild,v 1.3 2015/01/16 12:42:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.2.1.ebuild,v 1.4 2015/01/18 19:01:31 grobian Exp $
 
 EAPI=5
 inherit eutils libtool multilib multilib-minimal toolchain-funcs
@@ -40,6 +40,7 @@ src_prepare() {
 	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 	epatch "${FILESDIR}"/${PN}-3.2.1-o-tmpfile-eacces.patch #529044
 	epatch "${FILESDIR}"/${PN}-3.2.1-complex_alpha.patch
+	epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch
 	epatch_user
 	elibtoolize
 }
diff --git a/dev-libs/libffi/libffi-3.2.ebuild b/dev-libs/libffi/libffi-3.2.ebuild
index 3acd45c5d13f..51647d81db67 100644
--- a/dev-libs/libffi/libffi-3.2.ebuild
+++ b/dev-libs/libffi/libffi-3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.2.ebuild,v 1.2 2014/11/19 05:30:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.2.ebuild,v 1.3 2015/01/18 19:01:31 grobian Exp $
 
 EAPI=5
 inherit eutils libtool multilib multilib-minimal toolchain-funcs
@@ -40,6 +40,8 @@ pkg_setup() {
 src_prepare() {
 	sed -i -e 's:@toolexeclibdir@:$(libdir):g' Makefile.in || die #462814
 
+	epatch "${FILESDIR}"/${PN}-3.1-darwin-x32.patch
+
 	epatch_user
 	elibtoolize
 }