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 | b8d97d620e4923bf63f0ac19a903a5d5adb988f8 (patch) | |
| tree | 5b89ed653dee8e0e08df0722a7a666daf3f34944 /eclass | |
| parent | Module::Build is no longer part of core Perl and has been moved to dev-perl (diff) | |
| download | gentoo-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')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build-multilib.eclass | 22 |
2 files changed, 15 insertions, 13 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index feb19457620c..bf9067b1d901 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1660 2015/06/13 19:01:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13 22:13:24 pesa Exp $ + + 13 Jun 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: + sh is "supported", don't fallback to generic. Also, don't die when tc-arch is + unknown, the configure script can handle this internally. 13 Jun 2015; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass: Allow dev-perl/Module-Build in QA check for Module::Build 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 |