diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-03-01 15:19:14 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-03-01 15:19:14 +0000 |
| commit | bd91d9980d1d9e5a0540977f6323aebc10e27385 (patch) | |
| tree | da51ee3be2b72ca0ff2c71050951ab924d424ebf /eclass | |
| parent | Version bump ipdb to 0.6.1 for bug 402805. (diff) | |
| download | historical-bd91d9980d1d9e5a0540977f6323aebc10e27385.tar.gz historical-bd91d9980d1d9e5a0540977f6323aebc10e27385.tar.bz2 historical-bd91d9980d1d9e5a0540977f6323aebc10e27385.zip | |
Cleanup qt_mkspecs_dir().
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 23 |
2 files changed, 16 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 23b854f1d688..f0250aad96c9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.149 2012/03/01 15:06:00 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.150 2012/03/01 15:19:14 pesa Exp $ + + 01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Cleanup qt_mkspecs_dir(). 01 Mar 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: Fold standard_configure_options() into qt4-build_src_configure(). diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 71d5cd616a6c..5fde72782c5b 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.121 2012/03/01 15:06:00 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.122 2012/03/01 15:19:14 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -753,7 +753,8 @@ qt_use() { # Allows us to define which mkspecs dir we want to use. qt_mkspecs_dir() { local spec= - case ${CHOST} in + + case "${CHOST}" in *-freebsd*|*-dragonfly*) spec=freebsd ;; *-openbsd*) @@ -774,17 +775,17 @@ qt_mkspecs_dir() { *-linux-*|*-linux) spec=linux ;; *) - die "Unknown CHOST, no platform chosen" + die "${FUNCNAME}(): Unknown CHOST '${CHOST}'" ;; esac - CXX=$(tc-getCXX) - if [[ ${CXX} == *g++* ]]; then - spec+=-g++ - elif [[ ${CXX} == *icpc* ]]; then - spec+=-icc - else - die "Unknown compiler '${CXX}'" - fi + case "$(tc-getCXX)" in + *g++*) + spec+=-g++ ;; + *icpc*) + spec+=-icc ;; + *) + die "${FUNCNAME}(): Unknown compiler '$(tc-getCXX)'" ;; + esac # Add -64 for 64bit profiles if use x64-freebsd || |