summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2013-03-05 19:52:08 +0000
committerMike Pagano <mpagano@gentoo.org>2013-03-05 19:52:08 +0000
commit676ddaa0c2f5c7924b070a26359433f9e1e88df5 (patch)
tree7e6689e134b6b67bd55055d658664df81aee9e5a /eclass/kernel-2.eclass
parenteqmake4: override also QMAKE_LINK_C, used by packages with "CONFIG+=use_c_lin... (diff)
downloadgentoo-2-676ddaa0c2f5c7924b070a26359433f9e1e88df5.tar.gz
gentoo-2-676ddaa0c2f5c7924b070a26359433f9e1e88df5.tar.bz2
gentoo-2-676ddaa0c2f5c7924b070a26359433f9e1e88df5.zip
Force python 2* for USE=deblob as deblob script does not yet support python3. Thanks to Arfrever. See bug #458032
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 9f0ff7435b4a..8ebee41155b2 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.277 2012/06/24 17:52:38 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.278 2013/03/05 19:52:08 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -458,6 +458,7 @@ if [[ ${ETYPE} == sources ]]; then
DEBLOB_URI="${DEBLOB_HOMEPAGE}/${DEBLOB_URI_PATH}/${DEBLOB_A}"
HOMEPAGE="${HOMEPAGE} ${DEBLOB_HOMEPAGE}"
+ DEPEND+=" deblob? ( =dev-lang/python-2* )"
KERNEL_URI="${KERNEL_URI}
deblob? (
${DEBLOB_URI}
@@ -1165,8 +1166,7 @@ kernel-2_src_compile() {
if [[ $K_DEBLOB_AVAILABLE == 1 ]] && use deblob ; then
echo ">>> Running deblob script ..."
- sh "${T}/${DEBLOB_A}" --force || \
- die "Deblob script failed to run!!!"
+ EPYTHON="python2" sh "${T}/${DEBLOB_A}" --force || die "Deblob script failed to run!!!"
fi
}