diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-11-29 01:16:41 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-11-29 01:16:41 +0000 |
| commit | 52f07fd0e07959227c4eb3ed2b8efc7e8cdf7e36 (patch) | |
| tree | e5ea905f5f7c55732c239dd0ccd553e8771ca3ab /eclass | |
| parent | Version bump (diff) | |
| download | historical-52f07fd0e07959227c4eb3ed2b8efc7e8cdf7e36.tar.gz historical-52f07fd0e07959227c4eb3ed2b8efc7e8cdf7e36.tar.bz2 historical-52f07fd0e07959227c4eb3ed2b8efc7e8cdf7e36.zip | |
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...)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 050ea2cefc39..31b5e2e63b57 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -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@gentoo.org> @@ -1204,6 +1204,12 @@ gcc_do_configure() { --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}" |