pesa 15/06/13 22:13:24 Modified: ChangeLog qt4-build-multilib.eclass Log: sh is "supported", don't fallback to generic. Also, don't die when tc-arch is unknown, the configure script can handle this internally.
Revision Changes Path 1.1661 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1660&r2=1.1661 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1660 retrieving revision 1.1661 diff -u -r1.1660 -r1.1661 --- ChangeLog 13 Jun 2015 19:01:10 -0000 1.1660 +++ ChangeLog 13 Jun 2015 22:13:24 -0000 1.1661 @@ -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 <[email protected]> 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 <[email protected]> perl-module.eclass: Allow dev-perl/Module-Build in QA check for Module::Build 1.24 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.23&r2=1.24 Index: qt4-build-multilib.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- qt4-build-multilib.eclass 13 Jun 2015 17:28:13 -0000 1.23 +++ qt4-build-multilib.eclass 13 Jun 2015 22:13:24 -0000 1.24 @@ -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 @@ 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
