Add patch to be able to autoconf libgomp using autoconf >=2.64, bug #308515

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

7 files changed, 40 insertions, 20 deletions

diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 789df3ce0204..20321bc33e87 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.14 2010/03/24 06:57:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.15 2010/03/26 19:26:18 grobian Exp $
+
+  26 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  gcc-apple-4.2.1_p5566-r2.ebuild, gcc-apple-4.2.1_p5574.ebuild,
+  gcc-apple-4.2.1_p5646.ebuild, gcc-apple-4.2.1_p5647.ebuild,
+  +files/gcc-apple-4.2.1-autoconf-m4-precious.patch:
+  Add patch to be able to autoconf libgomp using autoconf >=2.64, bug
+  #308515
 
   24 Mar 2010; Fabian Groffen <grobian@gentoo.org>
   gcc-apple-4.2.1_p5647.ebuild:
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index f511e19afb5a..ce630ec5926e 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -1,4 +1,5 @@
 AUX gcc-apple-4.0.1_p5465-default-altivec.patch 1381 RMD160 e2c62e9cd060538f1ec03cef6487031e7ac88607 SHA1 01131175af3ca748494057f3660947e1d969149f SHA256 699dfea402a5a2d80f8374254a36fc7552f32b5fc25c1d15d9b88b7742874f09
+AUX gcc-apple-4.2.1-autoconf-m4-precious.patch 339 RMD160 4f200f959cddc9877e83a015e3d8b9f87329712c SHA1 be014e546b4ae6c7e523e60c59c100ab6d6571b7 SHA256 1e95837e5b60036fd8b1aad16c3b1847225320da40a3437736166a2f5bc0032a
 AUX gcc-apple-4.2.1-dsymutil.patch 853 RMD160 3e86edb057bb5a6248706a031afa56a599d4d6ef SHA1 3a2b844d68074c7c0e582eb51ddb9c5a6889a8bc SHA256 bba3d9d406afe12f1fd55f7b91ab65c07d4a1b37401d711a0ea287104aa07040
 AUX gcc-apple-4.2.1-gfortran.patch 1745 RMD160 d0adb5edc1a6805a915c36e3ae89d61f57c49a97 SHA1 e831cd60aec04c5e27752b9522df584e11da8463 SHA256 aaaaa9f95e8d9c100298ddff6b64480c73cd8463c32ab7b748780036ad508011
 AUX gcc-apple-4.2.1-inline-asm.patch 955 RMD160 5991da80a5b1c8757cff3be8fc04949e795f2787 SHA1 5fbb63447594b04c16e12085cd72002657aecc85 SHA256 abd3e20f84bd15585350d034883fa9728691c33164b55370a8d3b984de910e1f
@@ -21,9 +22,9 @@ DIST libstdcxx-39.tar.gz 117081330 RMD160 3ddba697f55590138592cc7c7d0a34f8775acb
 EBUILD gcc-apple-3.5.0_p3506-r1.ebuild 4525 RMD160 2ee75fa752de5fb224d091836d5c4e6e61c7cc0a SHA1 c983d148b3ff618dc4c78fe661439812705cc248 SHA256 0319a7c2d363924a47979f414ef61577febb4b7a5b759d6797af608c3aed614e
 EBUILD gcc-apple-4.0.1_p5490-r2.ebuild 8530 RMD160 43f321eda46adab01c0aa8b39e9c23b262bbba5f SHA1 b572e56fdab9bd8aa25b3dcf691d1758e059bca6 SHA256 4083d8a2a3e8bab279c49c92b8d14710de663cfd2416315d6b5ade0f1cb1208b
 EBUILD gcc-apple-4.0.1_p5493.ebuild 8542 RMD160 e53dadf5d96ca4bb89494ed0f032e1dbfb8667bb SHA1 5470dcd599e434572a00e860c86e0212fa3707a6 SHA256 014c6b7d8737be6efcecb2ac533881cb2cacb932e3a0af8de683e4974ce08c32
-EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10763 RMD160 452b7b40768c8ff31ea5b8169d5ef68211e8c8d3 SHA1 6a2a925eea790840cd01b374a44b806485722ff1 SHA256 2040615b97abee9917e95ee7cd2764242bedabb05180c7b7c999ecf7aa703457
-EBUILD gcc-apple-4.2.1_p5574.ebuild 10777 RMD160 b70aad820c70cdc808baa4e2345e82bf5532f5a0 SHA1 d233cd182e11be54cb087daa1bd2003d59f2389f SHA256 12658a729831f0f94553053a57d529fefb8db2f56e3e56d5d3b1eb2a237df651
-EBUILD gcc-apple-4.2.1_p5646.ebuild 11282 RMD160 c29650c8b9035cdec1d74cdd9148a36fe56cf120 SHA1 a921de7a08be55dcc4d888182fc0f3f77971d5bf SHA256 9a6c13192476f8b93fbd7dec9526632e4336fb9c4b03eb604c15f128c93ae6b4
-EBUILD gcc-apple-4.2.1_p5647.ebuild 11257 RMD160 a3902a3d2bf17ffc06bb3b8c9dc811f8f244ed57 SHA1 04ac9f47cc5e7f2e3834b7cf0334e738471b7718 SHA256 f95a216b19ea972a11043769795df7a0ab5d191b522c6629acd7a9360a8dccfc
-MISC ChangeLog 11270 RMD160 0bb63c154b1edba6f7fc20f8798bbed6d81f3a10 SHA1 5def3d7c0bc0865b095c62bd23bfb7f8c51b2522 SHA256 965c9c918a1c8dcce9308127c3b556ab2444ba9a087afbc10075a3b31a78a978
+EBUILD gcc-apple-4.2.1_p5566-r2.ebuild 10829 RMD160 8999218072ec2f98dca8bb77f9e74c43c414ecc2 SHA1 db70b5dc4b07bb0bad23a08ffea6f2170bc66afb SHA256 9222690406b3ef9f648b89665a1f1a609da5f823a7f368bdd1e844cfceba188f
+EBUILD gcc-apple-4.2.1_p5574.ebuild 10843 RMD160 954e8e1dda7435ed9239aef0a31c22a251299e52 SHA1 52bb5ec4865474177592587f617fa9e112439c91 SHA256 c45309947cdff4e24cc127526ff650585788f569b1200fe3e11e1ecc29b33cdd
+EBUILD gcc-apple-4.2.1_p5646.ebuild 11284 RMD160 fa8565150fcae722e94f0d2e83f54f0206926dc8 SHA1 8e83b44349bc7f0daa7ccb2db917183ddca78a2d SHA256 682aaca8906ab9b23d2c58b37bdbbcd38c3c1422baef6a77008bfa855da94590
+EBUILD gcc-apple-4.2.1_p5647.ebuild 11324 RMD160 8fcc6fff79ab8c24669879e72a1f16285daea9e3 SHA1 74bff25a08ca9e75562c81b59ba9d9c25e33aa1d SHA256 26214ce1a90064cf86e740e752067a6c838da1238b9985a083e92222329a48b5
+MISC ChangeLog 11582 RMD160 936babe949e1b4695be2137a57689b8152545a20 SHA1 97baaff74d2ee869e19e39aeeaea9b137e18852b SHA256 4dd434ec25ff8f6d575b7183db13b35440940f184d7f7357a379690f018ec0cf
 MISC metadata.xml 440 RMD160 1e6092437bb8a8de48d6679a0802489000b2ee93 SHA1 37485b6a6b03cf46be3bd4d80e809b559c13330b SHA256 fe55903cd5820f6651e134125cfc4eeadb1322a6a06e286a246ef0f70c55c517
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1-autoconf-m4-precious.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-autoconf-m4-precious.patch
new file mode 100644
index 000000000000..4873187c19d4
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1-autoconf-m4-precious.patch
@@ -0,0 +1,12 @@
+http://sourceware.org/ml/libffi-discuss/2009/msg00289.html
+
+--- libgomp/configure.ac
++++ libgomp/configure.ac
+@@ -110,6 +110,7 @@
+ m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
+ m4_define([_AC_ARG_VAR_PRECIOUS],[])
+ AC_PROG_CC
++m4_undefine([_AC_ARG_VAR_PRECIOUS])
+ m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+ 
+ AC_SUBST(CFLAGS)
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
index 3b023487f98d..8219e3c60034 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.3 2010/03/09 17:53:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5566-r2.ebuild,v 1.4 2010/03/26 19:26:18 grobian Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ nocxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -108,6 +108,7 @@ src_prepare() {
 	eprefixify "${S}"/gcc/gcc.c
 
 	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
 	cd "${S}"/gcc && eautoconf
 	cd "${S}"/libgomp && eautoconf
 
@@ -186,8 +187,7 @@ src_configure() {
 	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
 		&& myconf="${myconf} --disable-multilib"
 
-	#libstdcxx does not support this one
-	myconf="${myconf} --enable-languages=${langs}"
+	myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
 
 	# The produced libgcc_s.dylib is faulty if using a bit too much
 	# optimisation.  Nail it down to something sane
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
index 14f8c8449183..6c66df8e2af0 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.6 2010/03/09 17:53:25 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.7 2010/03/26 19:26:18 grobian Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ nocxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -108,6 +108,7 @@ src_prepare() {
 	eprefixify "${S}"/gcc/gcc.c
 
 	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
 	cd "${S}"/gcc && eautoconf
 	cd "${S}"/libgomp && eautoconf
 
@@ -186,8 +187,7 @@ src_configure() {
 	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
 		&& myconf="${myconf} --disable-multilib"
 
-	#libstdcxx does not support this one
-	myconf="${myconf} --enable-languages=${langs}"
+	myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
 
 	# The produced libgcc_s.dylib is faulty if using a bit too much
 	# optimisation.  Nail it down to something sane
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
index 7a89fd9f2dbe..da885510fe4b 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.7 2010/03/13 14:57:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5646.ebuild,v 1.8 2010/03/26 19:26:18 grobian Exp $
 
 EAPI="3"
 
@@ -37,7 +37,7 @@ fi
 
 KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
 
-IUSE="fortran nls objc objc++ nocxx"
+IUSE="fortran nls +openmp objc objc++ nocxx"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.2-r2
@@ -102,7 +102,6 @@ src_prepare() {
 		gcc/Makefile.in || die "sed gcc/Makefile.in failed."
 
 	epatch "${FILESDIR}"/${PN}-4.0.1_p5465-default-altivec.patch
-	#epatch "${FILESDIR}"/${PN}-4.2.1_p5566-x86_64-defines.patch
 
 	# dsymutil stuff breaks on 10.4/x86, revert it
 	[[ ${CHOST} == *86*-apple-darwin8 ]] && \
@@ -124,6 +123,7 @@ src_prepare() {
 	eprefixify "${S}"/gcc/gcc.c
 
 	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
 	cd "${S}"/gcc && eautoconf
 	cd "${S}"/libgomp && eautoconf
 
@@ -202,8 +202,7 @@ src_configure() {
 	[[ -z ${I_KNOW_WHAT_IM_DOING_I_WANT_APPLE_MULTILIB} ]] \
 		&& myconf="${myconf} --disable-multilib"
 
-	#libstdcxx does not support this one
-	myconf="${myconf} --enable-languages=${langs}"
+	myconf="${myconf} --enable-languages=${langs} $(use_enable openmp libgomp)"
 
 	# The produced libgcc_s.dylib is faulty if using a bit too much
 	# optimisation.  Nail it down to something sane
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
index b1aabc72abbf..c0e058c04b58 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.7 2010/03/24 06:57:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5647.ebuild,v 1.8 2010/03/26 19:26:18 grobian Exp $
 
 EAPI="3"
 
@@ -123,6 +123,7 @@ src_prepare() {
 	eprefixify "${S}"/gcc/gcc.c
 
 	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-texinfo.patch
+	epatch "${FILESDIR}"/${PN}-${GCC_VERS}-autoconf-m4-precious.patch
 	cd "${S}"/gcc && eautoconf
 	cd "${S}"/libgomp && eautoconf