[gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass

[Diego Petteno (flameeyes)]

flameeyes    09/03/11 23:58:31

  Modified:             qt4-build.eclass
  Log:
  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.

Revision  Changes    Path
1.27                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.26&r2=1.27

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4-build.eclass	5 Mar 2009 09:25:01 -0000	1.26
+++ qt4-build.eclass	11 Mar 2009 23:58:31 -0000	1.27
@@ -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 @@
 	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