diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-06-13 22:13:24 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-06-13 22:13:24 +0000 |
| commit | 41f61d9945d9e84023395bf47d915e2654937050 (patch) | |
| tree | 769a4ec00a1bd9fa3e807c6232dcf89d2c82fed9 /eclass/qt4-build-multilib.eclass | |
| parent | Remove old. (diff) | |
| download | historical-41f61d9945d9e84023395bf47d915e2654937050.tar.gz historical-41f61d9945d9e84023395bf47d915e2654937050.tar.bz2 historical-41f61d9945d9e84023395bf47d915e2654937050.zip | |
sh is "supported", don't fallback to generic.
Also, don't die when tc-arch is unknown, the configure script can handle this internally.
Diffstat (limited to 'eclass/qt4-build-multilib.eclass')
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index a7264e99e3f5..54d225a6e7ff 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23 2015/06/13 17:28:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.24 2015/06/13 22:13:24 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -300,17 +300,15 @@ qt4_multilib_src_configure() { STRIP=$(tc-getSTRIP) # convert tc-arch to the values supported by Qt - local arch= - case $(tc-arch) in - amd64|x64-*) arch=x86_64 ;; - ppc*-macos) arch=ppc ;; - ppc*) arch=powerpc ;; - sparc*) arch=sparc ;; - x86-macos) arch=x86 ;; - x86*) arch=i386 ;; - alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; - arm64|hppa|sh) arch=generic ;; - *) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;; + local arch=$(tc-arch) + case ${arch} in + amd64|x64-*) arch=x86_64 ;; + arm64|hppa) arch=generic ;; + ppc*-macos) arch=ppc ;; + ppc*) arch=powerpc ;; + sparc*) arch=sparc ;; + x86-macos) arch=x86 ;; + x86*) arch=i386 ;; esac # configure arguments |