[patch] gcc-multilib.patch

gcc-multilib.patch (text/plain), 1.93 KB, created by Stefan Hoelldampf on 2008-06-04 19:12:41 UTC

Index: sys-devel/gcc/gcc-4.2.3.ebuild
===================================================================
--- sys-devel/gcc/gcc-4.2.3.ebuild	(revision 23046)
+++ sys-devel/gcc/gcc-4.2.3.ebuild	(working copy)
@@ -80,7 +80,10 @@
 
 	# make sure 64-bits native targets don't screw up the linker paths
 	epatch "${FILESDIR}"/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	if ! use amd64; then
+		# amd64 multilib can not build the 32 bit part using this patch
+		epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	fi
 
 	# interix patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15212
 	epatch "${FILESDIR}"/4.2.2/interix-x86.patch.bz2
Index: sys-devel/gcc/gcc-4.2.4.ebuild
===================================================================
--- sys-devel/gcc/gcc-4.2.4.ebuild	(revision 23046)
+++ sys-devel/gcc/gcc-4.2.4.ebuild	(working copy)
@@ -80,7 +80,10 @@
 
 	# make sure 64-bits native targets don't screw up the linker paths
 	epatch "${FILESDIR}"/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	if ! use amd64; then
+		# amd64 multilib can not build the 32 bit part using this patch
+		epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	fi
 
 	# interix patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15212
 	epatch "${FILESDIR}"/4.2.2/interix-x86.patch.bz2
Index: sys-devel/gcc/gcc-4.3.0.ebuild
===================================================================
--- sys-devel/gcc/gcc-4.3.0.ebuild	(revision 23046)
+++ sys-devel/gcc/gcc-4.3.0.ebuild	(working copy)
@@ -79,7 +79,10 @@
 
 	# make sure 64-bits native targets don't screw up the linker paths
 	epatch "${FILESDIR}"/solaris-searchpath.patch
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	if ! use amd64; then
+		# amd64 multilib can not build the 32 bit part using this patch
+		epatch "${FILESDIR}"/no-libs-for-startfile.patch
+	fi
 
 	# interix patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15212
 	#doesn't apply