| 1 |
cryos 08/10/11 21:31:19 |
| 2 |
|
| 3 |
Modified: kde.eclass |
| 4 |
Log: |
| 5 |
Export PATH with KDEDIR first before calling configure or make. Fixes |
| 6 |
bug 238027. |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.222 eclass/kde.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.222&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.222&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.221&r2=1.222 |
| 14 |
|
| 15 |
Index: kde.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v |
| 18 |
retrieving revision 1.221 |
| 19 |
retrieving revision 1.222 |
| 20 |
diff -u -r1.221 -r1.222 |
| 21 |
--- kde.eclass 6 Oct 2008 12:49:43 -0000 1.221 |
| 22 |
+++ kde.eclass 11 Oct 2008 21:31:19 -0000 1.222 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.221 2008/10/06 12:49:43 jmbsvicetto Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.222 2008/10/11 21:31:19 cryos Exp $ |
| 28 |
|
| 29 |
# @ECLASS: kde.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -378,6 +378,8 @@ |
| 32 |
myconf="${myconf} --enable-libsuffix=$(get_libdir | sed s/lib//)" |
| 33 |
fi |
| 34 |
|
| 35 |
+ export PATH="${KDEDIR}/bin:${PATH}" |
| 36 |
+ |
| 37 |
# The configure checks for kconfig_compiler do not respect PATH |
| 38 |
export KCONFIG_COMPILER="${KDEDIR}/bin/kconfig_compiler" |
| 39 |
|
| 40 |
@@ -407,7 +409,6 @@ |
| 41 |
fi |
| 42 |
;; |
| 43 |
make) |
| 44 |
- export PATH="${KDEDIR}/bin:${PATH}" |
| 45 |
debug-print-section make |
| 46 |
emake || die "died running emake, $FUNCNAME:make" |
| 47 |
;; |
| 48 |
@@ -438,6 +439,9 @@ |
| 49 |
[[ -z ${KDE_S} ]] && KDE_S="${S}" |
| 50 |
cd "${KDE_S}" |
| 51 |
|
| 52 |
+ # Ensure that KDE binaries take precedence |
| 53 |
+ export PATH="${KDEDIR}/bin:${PATH}" |
| 54 |
+ |
| 55 |
while [[ "$1" ]]; do |
| 56 |
|
| 57 |
case $1 in |
Archives