diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-11 17:16:04 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-11 17:16:04 +0000 |
| commit | 09fa5a25a2af76e353fe6e028dece68e81dc260e (patch) | |
| tree | ad8db87ceaca60deb5c47553db21a3346d02d311 /eclass/kde4-base.eclass | |
| parent | version bump (bug #374569) (diff) | |
| download | historical-09fa5a25a2af76e353fe6e028dece68e81dc260e.tar.gz historical-09fa5a25a2af76e353fe6e028dece68e81dc260e.tar.bz2 historical-09fa5a25a2af76e353fe6e028dece68e81dc260e.zip | |
Detect the gcc version in a really saner conditional.
Diffstat (limited to 'eclass/kde4-base.eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 94dbe76d133a..38edb6537fe9 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.102 2011/07/10 17:53:37 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.103 2011/07/11 17:16:04 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -621,6 +621,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}" # Do some basic settings kde4-base_pkg_setup() { debug-print-function ${FUNCNAME} "$@" + local gccversion if has kdeprefix ${IUSE//+} && use kdeprefix; then eerror "Sorry, kdeprefix support has been removed." @@ -644,8 +645,8 @@ kde4-base_pkg_setup() { # and for others we do just quick scan in pkg_setup because pkg_pretend # executions consume quite some time. if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \ + gccversion=$(gcc-major-version)$(gcc-minor-version) + [[ ${gccversion} < 43 ]] \ && die "Sorry, but gcc-4.3 and earlier wont work for KDE (see bug 354837)." fi |