diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-09-27 19:34:28 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-09-27 19:34:28 +0000 |
| commit | 3a5ef7dc93906835d8ca24ef59aa5ddfa84b4e08 (patch) | |
| tree | 92ff299707c54f6cbf40289023b2fbbf9886c77c | |
| parent | Drop mask for javacc-5.0. #315557 (diff) | |
| download | historical-3a5ef7dc93906835d8ca24ef59aa5ddfa84b4e08.tar.gz historical-3a5ef7dc93906835d8ca24ef59aa5ddfa84b4e08.tar.bz2 historical-3a5ef7dc93906835d8ca24ef59aa5ddfa84b4e08.zip | |
Fixed tc-ninja_magic_to_arch() to also use KV_FULL and fail if no kernel version specified, bug 432390
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 5546d08151b0..0868cf88f7ed 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.415 2012/09/27 17:12:34 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.416 2012/09/27 19:34:28 axs Exp $ + + 27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> toolchain-funcs.eclass: + Fixed tc-ninja_magic_to_arch() to also use KV_FULL and fail if no kernel + version specified, bug 432390 27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> eutils.eclass: Made 'usex' declaration conditional on lack of PM or EAPI5+ support diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 97554cecf0ae..7574944895d4 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.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/toolchain-funcs.eclass,v 1.117 2012/09/15 16:16:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.118 2012/09/27 19:34:28 axs Exp $ # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -357,6 +357,9 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } local host=$2 [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} + local KV=${KV:-${KV_FULL}} + [[ -z ${KV} ]] && die "toolchain-funcs.eclass: Kernel version could not be determined, please inherit kernel-2 or linux-info" + case ${host} in aarch64*) ninj aarch64 arm;; alpha*) echo alpha;; |