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

(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)

6 files changed, 34 insertions, 15 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/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