1 |
betelgeuse 07/11/26 20:38:27 |
2 |
|
3 |
Modified: java-utils-2.eclass |
4 |
Log: |
5 |
Use export VAR= instead of unset because Portage does not preserve unsetting across functions. |
6 |
|
7 |
Revision Changes Path |
8 |
1.97 eclass/java-utils-2.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.96&r2=1.97 |
13 |
|
14 |
Index: java-utils-2.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v |
17 |
retrieving revision 1.96 |
18 |
retrieving revision 1.97 |
19 |
diff -u -r1.96 -r1.97 |
20 |
--- java-utils-2.eclass 25 Nov 2007 07:51:41 -0000 1.96 |
21 |
+++ java-utils-2.eclass 26 Nov 2007 20:38:26 -0000 1.97 |
22 |
@@ -6,7 +6,7 @@ |
23 |
# |
24 |
# Licensed under the GNU General Public License, v2 |
25 |
# |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.96 2007/11/25 07:51:41 caster Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $ |
28 |
|
29 |
# ----------------------------------------------------------------------------- |
30 |
# @eclass-begin |
31 |
@@ -2049,6 +2049,7 @@ |
32 |
# |
33 |
# ----------------------------------------------------------------------------- |
34 |
java-pkg_init() { |
35 |
+ debug-print-function ${FUNCNAME} $* |
36 |
unset JAVAC |
37 |
unset JAVA_HOME |
38 |
|
39 |
@@ -2066,7 +2067,7 @@ |
40 |
fi |
41 |
|
42 |
if [[ -z ${accept} ]]; then |
43 |
- unset _JAVA_OPTIONS |
44 |
+ export _JAVA_OPTIONS= |
45 |
# phase hooks make this run many times without this |
46 |
I_WANT_GLOBAL_JAVA_OPTIONS="true" |
47 |
fi |
48 |
@@ -2084,15 +2085,18 @@ |
49 |
# Do some QA checks |
50 |
java-pkg_check-jikes |
51 |
|
52 |
+ # Can't use unset here because Portage does not save the unset |
53 |
+ # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11 |
54 |
+ |
55 |
# When users have crazy classpaths some packages can fail to compile. |
56 |
# and everything should work with empty CLASSPATH. |
57 |
# This also helps prevent unexpected dependencies on random things |
58 |
# from the CLASSPATH. |
59 |
- unset CLASSPATH |
60 |
+ export CLASSPATH= |
61 |
|
62 |
# Unset external ANT_ stuff |
63 |
- unset ANT_TASKS |
64 |
- unset ANT_OPTS |
65 |
+ export ANT_TASKS= |
66 |
+ export ANT_OPTS= |
67 |
} |
68 |
|
69 |
# ------------------------------------------------------------------------------ |
70 |
|
71 |
|
72 |
|
73 |
-- |
74 |
gentoo-commits@g.o mailing list |