diff options
| author |   John Mylchreest <johnm@gentoo.org> | 2006-05-04 15:37:35 +0000 |
|---|---|---|
| committer | John Mylchreest <johnm@gentoo.org> | 2006-05-04 15:37:35 +0000 |
| commit | 88a34b7e2ced510d0420178abd6620b3360f3205 (patch) | |
| tree | 7d85267c10d30235a22219930dbb6e0bbb395ee8 /eclass | |
| parent | New upstream version. (diff) | |
| download | gentoo-2-88a34b7e2ced510d0420178abd6620b3360f3205.tar.gz gentoo-2-88a34b7e2ced510d0420178abd6620b3360f3205.tar.bz2 gentoo-2-88a34b7e2ced510d0420178abd6620b3360f3205.zip | |
fixing bug #113614 once and for-all, unset KBUILD_OUTPUT very early on in global if these are kernel headers.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 4e90aca8c8d7..84903317af6b 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.173 2006/05/03 20:50:09 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.174 2006/05/04 15:37:35 johnm Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -298,6 +298,10 @@ elif [[ ${ETYPE} == headers ]]; then DESCRIPTION="Linux system headers" IUSE="" + # Since we should NOT honour KBUILD_OUTPUT in headers + # lets unset it here. + unset KBUILD_OUTPUT + if [[ ${CTARGET} = ${CHOST} ]]; then DEPEND="!virtual/os-headers" PROVIDE="virtual/os-headers" @@ -402,10 +406,6 @@ unpack_fix_docbook() { compile_headers() { env_setup_xmakeopts - # Since KBUILD_OUTPUT shouldnt be used when compiling headers, lets unset it - # if it exists. - [[ -n ${KBUILD_OUTPUT} ]] && unset KBUILD_OUTPUT - # if we couldnt obtain HOSTCFLAGS from the Makefile, # then set it to something sane local HOSTCFLAGS=$(getfilevar HOSTCFLAGS "${S}"/Makefile) @@ -1014,10 +1014,6 @@ kernel-2_src_unpack() { env_setup_xmakeopts cd "${S}" - # since KBUILD_OUTPUT should only be used on the active kernel - # sources, we should unset it here. - [[ -n "${KBUILD_OUTPUT}" ]] && unset KBUILD_OUTPUT - # We dont need a version.h for anything other than headers # at least, I should hope we dont. If this causes problems # take out the if/fi block and inform me please. |