| 1 |
commit: bcd03209d095c9e170e49f706414ad1d380da7f9 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jun 27 16:38:29 2021 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 27 16:39:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd03209 |
| 7 |
|
| 8 |
java-pkg-simple.eclass: improved code related to java 9+ modules |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/796875 |
| 11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/java-pkg-simple.eclass | 32 ++++++++++++++++++++++++-------- |
| 14 |
1 file changed, 24 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass |
| 17 |
index 408e1aac44f..174fa08ce4e 100644 |
| 18 |
--- a/eclass/java-pkg-simple.eclass |
| 19 |
+++ b/eclass/java-pkg-simple.eclass |
| 20 |
@@ -361,9 +361,14 @@ java-pkg-simple_src_compile() { |
| 21 |
java-pkg-simple_getclasspath |
| 22 |
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}" |
| 23 |
|
| 24 |
- ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 25 |
- ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS}\ |
| 26 |
- @${sources} |
| 27 |
+ if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then |
| 28 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 29 |
+ ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources} |
| 30 |
+ else |
| 31 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 32 |
+ ${classpath:+--module-path ${classpath}} --module-version ${PV}\ |
| 33 |
+ ${JAVAC_ARGS} @${sources} |
| 34 |
+ fi |
| 35 |
|
| 36 |
# handle module-info.java separately as it needs at least JDK 9 |
| 37 |
if [[ -n ${moduleinfo} ]]; then |
| 38 |
@@ -372,7 +377,9 @@ java-pkg-simple_src_compile() { |
| 39 |
|
| 40 |
JAVA_PKG_WANT_SOURCE="9" |
| 41 |
JAVA_PKG_WANT_TARGET="9" |
| 42 |
- ejavac -d ${classes} -encoding ${JAVA_ENCODING} ${JAVAC_ARGS} "${moduleinfo}" |
| 43 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 44 |
+ ${classpath:+--module-path ${classpath}} --module-version ${PV}\ |
| 45 |
+ ${JAVAC_ARGS} "${moduleinfo}" |
| 46 |
|
| 47 |
JAVA_PKG_WANT_SOURCE=${tmp_source} |
| 48 |
JAVA_PKG_WANT_TARGET=${tmp_target} |
| 49 |
@@ -479,9 +486,16 @@ java-pkg-simple_src_test() { |
| 50 |
|
| 51 |
|
| 52 |
# compile |
| 53 |
- [[ -s ${test_sources} ]] && ejavac -d ${classes} ${JAVAC_ARGS} \ |
| 54 |
- -encoding ${JAVA_ENCODING} ${classpath:+-classpath ${classpath}} \ |
| 55 |
- @${test_sources} |
| 56 |
+ if [[ -s ${test_sources} ]]; then |
| 57 |
+ if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then |
| 58 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 59 |
+ ${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources} |
| 60 |
+ else |
| 61 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 62 |
+ ${classpath:+--module-path ${classpath}} --module-version ${PV}\ |
| 63 |
+ ${JAVAC_ARGS} @${test_sources} |
| 64 |
+ fi |
| 65 |
+ fi |
| 66 |
|
| 67 |
# handle module-info.java separately as it needs at least JDK 9 |
| 68 |
if [[ -n ${moduleinfo} ]]; then |
| 69 |
@@ -490,7 +504,9 @@ java-pkg-simple_src_test() { |
| 70 |
|
| 71 |
JAVA_PKG_WANT_SOURCE="9" |
| 72 |
JAVA_PKG_WANT_TARGET="9" |
| 73 |
- ejavac -d ${classes} -encoding ${JAVA_ENCODING} ${JAVAC_ARGS} "${moduleinfo}" |
| 74 |
+ ejavac -d ${classes} -encoding ${JAVA_ENCODING}\ |
| 75 |
+ ${classpath:+--module-path ${classpath}} --module-version ${PV}\ |
| 76 |
+ ${JAVAC_ARGS} "${moduleinfo}" |
| 77 |
|
| 78 |
JAVA_PKG_WANT_SOURCE=${tmp_source} |
| 79 |
JAVA_PKG_WANT_TARGET=${tmp_target} |
Archives