diff options
author | 2012-09-28 15:07:30 +0000 | |
---|---|---|
committer | 2012-09-28 15:07:30 +0000 | |
commit | 18ae488641de30d80c5a7e4108d73517a7b7b90c (patch) | |
tree | c5d311995f0f8f8511932e8934001e3d79b96299 /eclass | |
parent | Add libpng and rc to MISC-FREE license group. (diff) | |
download | gentoo-2-18ae488641de30d80c5a7e4108d73517a7b7b90c.tar.gz gentoo-2-18ae488641de30d80c5a7e4108d73517a7b7b90c.tar.bz2 gentoo-2-18ae488641de30d80c5a7e4108d73517a7b7b90c.zip |
reverted fatal error from unset and made it a warning only shown when checking for 'kern' arch, so that the portage environment call of tc-arch will not fail anymore, bug 436450
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 7 | ||||
-rw-r--r-- | eclass/toolchain-funcs.eclass | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f5aa822c1c06..b65ab5e19e21 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.417 2012/09/27 22:42:48 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.418 2012/09/28 15:07:30 axs Exp $ + + 28 Sep 2012; Ian Stakenvicius <axs@gentoo.org> toolchain-funcs.eclass: + reverted fatal error from unset and made it a warning only shown when + checking for 'kern' arch, so that the portage environment call of tc-arch + will not fail anymore, bug 436450 27 Sep 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: Remove a silly EAPI conditional. diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 7574944895d4..50825d156f30 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.118 2012/09/27 19:34:28 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.119 2012/09/28 15:07:30 axs Exp $ # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -358,7 +358,8 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $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" + [[ ${type} == "kern" ]] && [[ -z ${KV} ]] && \ + ewarn "QA: Kernel version could not be determined, please inherit kernel-2 or linux-info" case ${host} in aarch64*) ninj aarch64 arm;; |