summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-06-13 22:13:24 +0000
committerDavide Pesavento <pesa@gentoo.org>2015-06-13 22:13:24 +0000
commitb8d97d620e4923bf63f0ac19a903a5d5adb988f8 (patch)
tree5b89ed653dee8e0e08df0722a7a666daf3f34944 /eclass/qt4-build-multilib.eclass
parentModule::Build is no longer part of core Perl and has been moved to dev-perl (diff)
downloadgentoo-2-b8d97d620e4923bf63f0ac19a903a5d5adb988f8.tar.gz
gentoo-2-b8d97d620e4923bf63f0ac19a903a5d5adb988f8.tar.bz2
gentoo-2-b8d97d620e4923bf63f0ac19a903a5d5adb988f8.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.eclass22
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