[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Mike Frysinger (vapier)]

vapier      12/11/29 01:16:41

  Modified:             toolchain.eclass
  Log:
  disable X configure flags setting up bad -I/-L flags that will mess with multilib builds that need 3rd party libs (such as libjava and gtk/etc...)

Revision  Changes    Path
1.560                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.560&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.560&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.559&r2=1.560

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- toolchain.eclass	24 Nov 2012 22:27:06 -0000	1.559
+++ toolchain.eclass	29 Nov 2012 01:16:41 -0000	1.560
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.559 2012/11/24 22:27:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.560 2012/11/29 01:16:41 vapier Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 
@@ -1204,6 +1204,12 @@
 		--with-pkgversion="${BRANDING_GCC_PKGVERSION}"
 	set -- ${confgcc} "$@" ${EXTRA_ECONF}
 
+	# Do not let the X detection get in our way.  We know things can be found
+	# via system paths, so no need to hardcode things that'll break multilib.
+	# Older gcc versions will detect ac_x_libraries=/usr/lib64 which ends up
+	# killing the 32bit builds which want /usr/lib.
+	export ac_cv_have_x='have_x=yes ac_x_includes= ac_x_libraries='
+
 	# Nothing wrong with a good dose of verbosity
 	echo
 	einfo "PREFIX:			${PREFIX}"