From 4b6a221ee5c94b2e3fe933b5ba09b71ef6ee6900 Mon Sep 17 00:00:00 2001 From: Yixun Lan Date: Wed, 11 Mar 2015 14:07:56 +0000 Subject: [PATCH] set ARCH=arm64 as generic target for qt4 eclass --- eclass/ChangeLog | 6 +++++- eclass/qt4-build-multilib.eclass | 6 +++--- eclass/qt4-build.eclass | 6 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4599fbc0403b..0e0b91bab8a4 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.1560 2015/03/08 09:39:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1561 2015/03/11 14:07:56 dlan Exp $ + + 11 Mar 2015; Yixun Lan qt4-build.eclass, + qt4-build-multilib.eclass: + set ARCH=arm64 as generic target for qt4 eclass 08 Mar 2015; Ulrich Müller mysql-multilib.eclass, mysql-v2.eclass: diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index b303615b4c70..6e5e55b8bc74 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.5 2015/03/06 14:08:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.6 2015/03/11 14:07:56 dlan Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -290,8 +290,8 @@ qt4_multilib_src_configure() { sparc*) arch=sparc ;; x86-macos) arch=x86 ;; x86*) arch=i386 ;; - alpha|arm|arm64|ia64|mips|s390) arch=$(tc-arch) ;; - hppa|sh) arch=generic ;; + alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; + arm64|hppa|sh) arch=generic ;; *) die "qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)'" ;; esac diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 66683e010db6..e1c405da753e 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.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.eclass,v 1.159 2015/03/06 14:08:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.160 2015/03/11 14:07:56 dlan Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -325,8 +325,8 @@ qt4-build_src_configure() { sparc|sparc-*|sparc64-*) conf+=" -arch sparc" ;; x86-macos) conf+=" -arch x86" ;; x86|x86-*) conf+=" -arch i386" ;; - alpha|arm|arm64|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;; - hppa|sh) conf+=" -arch generic" ;; + alpha|arm|ia64|mips|s390) conf+=" -arch $(tc-arch)" ;; + arm64|hppa|sh) conf+=" -arch generic" ;; *) die "$(tc-arch) is unsupported by this eclass. Please file a bug." ;; esac -- 2.26.2