diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-03-11 23:58:31 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-03-11 23:58:31 +0000 |
| commit | b4b8e5f2a6ed9ef372bb3cdae0f21bc2cb3ab523 (patch) | |
| tree | cf816aacf939e0484d6921561b1977c5eeb36717 /eclass/qt4-build.eclass | |
| parent | Add new rc11; remove old (diff) | |
| download | gentoo-2-b4b8e5f2a6ed9ef372bb3cdae0f21bc2cb3ab523.tar.gz gentoo-2-b4b8e5f2a6ed9ef372bb3cdae0f21bc2cb3ab523.tar.bz2 gentoo-2-b4b8e5f2a6ed9ef372bb3cdae0f21bc2cb3ab523.zip | |
Use $(tc-arch) rather than ${ARCH}.
With this change, the 32-bit userland version of amd64 profiles will
build qt properly; without this, Qt will enable 64-bit instructions
when the compiler is set to produce 32-bit code, causing an assembler
failure.
This is needed to be able to build Qt4 for the emul-linux-x86
packages.
Diffstat (limited to 'eclass/qt4-build.eclass')
| -rw-r--r-- | eclass/qt4-build.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 2b6cc1bd9d7b..ac7adece258c 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 2007-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.26 2009/03/05 09:25:01 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.27 2009/03/11 23:58:31 flameeyes Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -209,14 +209,14 @@ standard_configure_options() { fi # ARCH is set on Gentoo. Qt now falls back to generic on an unsupported - # ${ARCH}. Therefore we convert it to supported values. - case "${ARCH}" in + # $(tc-arch). Therefore we convert it to supported values. + case "$(tc-arch)" in amd64) myconf="${myconf} -arch x86_64" ;; ppc|ppc64) myconf="${myconf} -arch powerpc" ;; x86|x86-*) myconf="${myconf} -arch i386" ;; - alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch ${ARCH}" ;; + alpha|arm|ia64|mips|s390|sparc) myconf="${myconf} -arch $(tc-arch)" ;; hppa|sh) myconf="${myconf} -arch generic" ;; - *) die "${ARCH} is unsupported by this eclass. Please file a bug." ;; + *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; esac myconf="${myconf} -stl -verbose -largefile -confirm-license -no-rpath |