| 1 |
betelgeuse 08/03/03 17:55:21 |
| 2 |
|
| 3 |
Modified: java-utils-2.eclass |
| 4 |
Log: |
| 5 |
Add the ability to get GENTOO_COMPILER from the JDK config. This enables things like jamvm to use ecj. Record SLOT in package.env. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.104 eclass/java-utils-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.104&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.104&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.103&r2=1.104 |
| 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.103 |
| 18 |
retrieving revision 1.104 |
| 19 |
diff -u -r1.103 -r1.104 |
| 20 |
--- java-utils-2.eclass 12 Jan 2008 15:08:47 -0000 1.103 |
| 21 |
+++ java-utils-2.eclass 3 Mar 2008 17:55:21 -0000 1.104 |
| 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.103 2008/01/12 15:08:47 caster Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.104 2008/03/03 17:55:21 betelgeuse Exp $ |
| 28 |
|
| 29 |
# ----------------------------------------------------------------------------- |
| 30 |
# @eclass-begin |
| 31 |
@@ -293,7 +293,6 @@ |
| 32 |
java-pkg_do_write_ |
| 33 |
} |
| 34 |
|
| 35 |
- |
| 36 |
# ------------------------------------------------------------------------------ |
| 37 |
# @internal-function depend-java-query |
| 38 |
# |
| 39 |
@@ -649,13 +648,7 @@ |
| 40 |
|
| 41 |
if ! [[ ${DEPEND} = *app-arch/zip* ]]; then |
| 42 |
local msg="${FUNCNAME} called without app-arch/zip in DEPEND" |
| 43 |
- if is-java-strict; then |
| 44 |
- eerror "${msg}" |
| 45 |
- die "${msg}" |
| 46 |
- else |
| 47 |
- echo "${msg}" |
| 48 |
- echo "Please report this to http://bugs.gentoo.org." |
| 49 |
- fi |
| 50 |
+ java-pkg_announce-qa-violation ${msg} |
| 51 |
fi |
| 52 |
|
| 53 |
java-pkg_init_paths_ |
| 54 |
@@ -2178,12 +2171,16 @@ |
| 55 |
# If it hasn't been defined already, default to javac |
| 56 |
if [[ -z ${GENTOO_COMPILER} ]]; then |
| 57 |
if [[ -n ${compilers} ]]; then |
| 58 |
- einfo "No suitable compiler found: defaulting javac for compilation" |
| 59 |
+ einfo "No suitable compiler found: defaulting to JDK default for compilation" |
| 60 |
else |
| 61 |
# probably don't need to notify users about the default. |
| 62 |
:;#einfo "Defaulting to javac for compilation" |
| 63 |
fi |
| 64 |
- export GENTOO_COMPILER=javac |
| 65 |
+ if java-config -g GENTOO_COMPILER 2> /dev/null; then |
| 66 |
+ export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER) |
| 67 |
+ else |
| 68 |
+ export GENTOO_COMPILER=javac |
| 69 |
+ fi |
| 70 |
else |
| 71 |
einfo "Using ${GENTOO_COMPILER} for compilation" |
| 72 |
fi |
| 73 |
@@ -2244,6 +2241,7 @@ |
| 74 |
( |
| 75 |
echo "DESCRIPTION=\"${DESCRIPTION}\"" |
| 76 |
echo "GENERATION=\"2\"" |
| 77 |
+ echo "SLOT=\"${SLOT}\"" |
| 78 |
|
| 79 |
[[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\"" |
| 80 |
[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\"" |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
-- |
| 85 |
gentoo-commits@l.g.o mailing list |
Archives