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

Package-Manager: portage-2.2.14-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

6 files changed, 47 insertions, 17 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/Manifest b/dev-libs/libffi/Manifest
index 4cb27371bdd4..3797dd9642ce 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX libffi-3.0.13-emutramp_pax_proc.patch 911 SHA256 955aa3d87522cb220133fa853bd3a5a7af1fe7cf5cc6b9eb74ffffb9ac563aba SHA512 402712b21feec0f162758adad630ecc588596eaebd2e79bb86802f313e102b8ef6d08eca0580a1aae25dabec3e018c499e2ce1960edc6af9182f67cd8cc9b0e1 WHIRLPOOL 22f76ca6f909c80228958115a8db37fbe5f12e291cdbc1fad672a0903c54a7918e2cee37fdc263e9c350f3c79a7870cc8f7a05789668a8dc87cb8434a6e20f9c
+AUX libffi-3.1-darwin-x32.patch 606 SHA256 419007aba26be807a25e6f34d319225458e3febc75c3f3d0c85093ded63e3cb2 SHA512 909e4c45f124d6a9d4a0b2b97fdcbf0451a15c11c3da581fc8571d4f4f0857306bbfddf682bbe0441f0c5c84a8489e4a79a792883bfe440224cf672567bf0a24 WHIRLPOOL 9f749489499e8e9fa7712ae4111424c47c695cd5ee7b6480a8a2f5cd638d8d95c000e16e81eb13603bd842c2d50d2d0c60480d519960c55b652867fd6cb95cde
 AUX libffi-3.1-execstack.patch 277 SHA256 55e95096d8b2bd82188c62b1316c602738336c0a4b58ccce503936dfc436b1d9 SHA512 1365cb102e6ffacd89b399243cd89ddb29259e373d16fd500d9d98bd40edbd0d79b63df6fb9464247cc2f11628d5c692a25f1c6d9cef19feb857e1232c154d4f WHIRLPOOL 597c3cdb8a28dcc15d724fa4d184956bcd4118803070ba63c1d914eb1a3b4c9720f68404a05ba4ad7ad83714f79ee7856bb8921886511bc7d35b39f33b4b41f0
 AUX libffi-3.1-typing_error.patch 350 SHA256 2e134e7f347f392499ec9128b220cff467919dfc048922d72689816d9f40ea95 SHA512 6be05ec604da587ded9d50ba57153b7ca24ee52dbed132d08f8653032153d377b2e399b58010e3c84e2106f077696a0cc9507018687af2082aa5ce055ba5fa07 WHIRLPOOL e8613594118774abaa2d79b0cdcbfd57d1c3ca275543423cec70b368e604c78bc7162d582a5b654b378b60a1d765a12b418bd10f8a8693ccbc3e7fdf225be216
 AUX libffi-3.2.1-complex_alpha.patch 601 SHA256 5653822db3b2338f6b7c63107868d20665a200f139616476fc1411ae76283fa5 SHA512 66890bf241236f08e0e726c820e2ff82df6071c1a3b25aa4f3f005b6431b94ec5a5f730db56de82c006e26415d72fe665d6ced37567bcdec6d84357faeb24bec WHIRLPOOL 1e020a6477eb137f5579de73a76a021eb2444a1223ef1e7b50460cbd92643c841429993d08517b7297b50f7d10aa4e5446f23ac1185d18712a5d28081d35eb74
@@ -11,17 +12,15 @@ DIST libffi-3.1.tar.gz 937214 SHA256 97feeeadca5e21870fa4433bc953d1b3af3f698d5df
 DIST libffi-3.2.1.tar.gz 940837 SHA256 d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 SHA512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 WHIRLPOOL b9d3c86e347029fa9f03fd3813405cc731099812ad6186bd4d2ea646354383803c90912b20e1804a6b7fc12719403b3c0c3b800bdbcab564a2c93fcb4fd722ad
 DIST libffi-3.2.tar.gz 940691 SHA256 6b2680fbf6ae9c2381d381248705857de22e05bae191889298f8e6bfb2ded4ef SHA512 fed5f6eec86144608966857f54bd69a5faa43427f27bc9178ebe2c7a1cecf925c20dbd6df07a207ae469842874efcf5b99fb7e09db59cbd92ebfc0a7e1bb62b7 WHIRLPOOL db7491bc5914eb6691aa366677c63af51979453330373251b1043b53163d1b56dbed65ba23c9f5047257e476e0d216045a06faa346790987047854ae1d04361d
 EBUILD libffi-3.0.13-r1.ebuild 2289 SHA256 44d26db4026bebca8d95f048fb947f48950e62116e797bdc429ffa429020e705 SHA512 ef2c6118a69e9d422160e3daadb9581f8faf8710ce27f675a13312c8e4c257d4df18a6d6b30b9864c152cbb5819099261374f53cef47a34b7f0b74c791580d5a WHIRLPOOL 33e06c242f0e338f7355ec9257ff8f89d7ccd89a6413465c605b04c9548713a9a8f70da5aa328cf52116b52acabfa92f1ede199eba8b4d286f0b894d2856c44c
-EBUILD libffi-3.1-r3.ebuild 2302 SHA256 01ebb6d8ed08b2d20c2ed2d7bedd2c467843df6b58ecdb39d8051820cef4ab61 SHA512 c2af031a827eec65f1b733269b62ca304636a4e4b8dea3e8a69c854303a30945b6bc6125b0e43c76174562c134c660debce756127d1ecbf2d11b1e15364e7675 WHIRLPOOL 3a4c19076ab58b109ab9f5df349c24f040b9f1ca8f8d043acbd0fd421bbb431fd0652589b038ab1810a630e47fd6cd585353637b8777cf124b033e189f5bd4f3
-EBUILD libffi-3.2.1.ebuild 2198 SHA256 07f426905bdce8f655e211458f6eb4b724c3bc6e8c8224d899a8db66459157ad SHA512 10a97c85329bdfeef97c09a1e5302d68fd1b41eefc51be73dbe527e032cb19e0bd841bd17e55ae1fa5e17c85fa3c2e1c915f444c824a0588ba5b84da40a30cf0 WHIRLPOOL d00cf7b4b4b83c55138e21a668dd1c3b491a05ea312eba39d74c24e8aec7f2abbdc2ed21b9186fd72fc31f4295cb1e06fbe430d74e9befd0cebf2df31b997956
-EBUILD libffi-3.2.ebuild 2134 SHA256 521c38c62a9820ab4d50bf2cd54f1eaaf9f4081de992d56ea54e598522f54d67 SHA512 b97d2ddae80d8bba97c5ad9f257b103c598a7b66afdb31bcc248f6a00637d10c08bcdfec2e7ff14304bc28ee5581db2f5507909208001f585b5340f6b1b23e83 WHIRLPOOL 717dc2525f5f0b7d5d0220ce5dada2a5d89e098fa23fc1f69d7c33295722208310c1a494d37cc1df35276fe94a9579f5a691fe5093b0d2d66d38be0b878692a0
-MISC ChangeLog 26793 SHA256 5c9f684bd25c1405a68f8fe9dd2c78557dae23add1c5e6eb32c60165837f3b51 SHA512 d99e423553854ed47b8e4fe848d93b354007176e1c98dcb9f997690addeddb37611cdce13537fd93dd2a66c63526fdec704bcd14c57ebe1f81cca0efe7ba6074 WHIRLPOOL 138c561eb2e9fafa775fc75a410e8bace909e6ecc14af4cb7189538901602a9f17f58e446867b59b7ea41e3ebddb3174be31c5bfd04b9a56f1f0fbe73e39db22
+EBUILD libffi-3.1-r3.ebuild 2343 SHA256 c5b90278e2d43842fcc34e31653c5ee29ab47306a5b6541bc6e89dbd8e935643 SHA512 569d3e79624952a6962b873996852f3bbe24b4e43459f5fd2162f767b84f1952b0a5cbb2c18905b3a5831ae23feda0340a141cce52ea257811d12b50bf07aec8 WHIRLPOOL 9b80903c4cb5d1f7c60e2283435e4adcaa57bc737fbb0b51622ff619d2897edf124f540772fa789033682945a5753ae143c1ca327f6bb94f9722cf2229fb9583
+EBUILD libffi-3.2.1.ebuild 2246 SHA256 2f602e9b730e7e7ec604e163436f23cea0d96689a76617c760dc9ef8ef6f714b SHA512 0e48dc61a143889995f3a9d030191f29c7665223261ccb6cd353cc699d5e4318f644b7c3745f3af7cde2c106b999d08a8e67ead133037b5f381044647a595e4a WHIRLPOOL 15e9390155df53fbce7a0fddb9ce7f82095319e581f67de37afb6cb64e74b8977d72e548bf0c1885febb4a6e22fb65068e5be57ed6cf3b410a6332f8504d76a1
+EBUILD libffi-3.2.ebuild 2185 SHA256 72c5ae795d7fa50b113a2d9d13bedf758c6df8ce5f2c12170d1e38a68348df53 SHA512 3003e900aa76a9ca3ab4ae6873e553a8528f64b3c52741260c0bc172a8c8721691822604e74a724ed0930de133f9fc0d090685cc5e846092f29d59c4ab503439 WHIRLPOOL 66f2770b93d249de67d6a9d1d5f5d424b3a906518af3957319de4556bc50b02b376dc82e43c6f106d23032a0d4fa4775649fe72fba1ea82f4c856a9eb23c8127
+MISC ChangeLog 26996 SHA256 0b1c4db4a5d7ec47057d3985bbeedc43559b89ccd2235169bbf3cd4ac67c91d0 SHA512 ce814e1338805b9f286042bb65f1b0fc7363cadb4a321e3081aa21581fe44d47e523f61bc169e751c5dc088acfc0bad0ae0d296359c27a215a886f2e3ad13174 WHIRLPOOL c6a1c399d8fafc16f7cf96675ab7b0b7a77f40fbbf2f94a3c2fa12a7df6993db8283e0fa232da12df793f20edba55cd6fcce2146a46656398ed5a5d4be507272
 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlS5ByBfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjPpgCfbimLTX6rr3hF6Zs2SZoDRl4M
-UPwAoIPLwMIVEzXa0o9DhNfeJx+2R/ag
-=Q/3o
+iEYEAREIAAYFAlS8Aw4ACgkQX3X2B8XHTokOqwCfSWDI7RCBazDU+cTuCxyQd3Wi
+P0wAn0xpHMCwiMKSC4cf11pel+k+eHad
+=sei4
 -----END PGP SIGNATURE-----
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
 }