From e9121ad78397fe746a1cc2806ab91bc9193e5e33 Mon Sep 17 00:00:00 2001
From: Manuel Mommertz <manuel.mommertz@desy.de>
Date: Fri, 12 Jan 2024 13:13:42 +0100
Subject: [PATCH 1/3] java-pkg-simple.eclass: make code related to java 9+
actually execute
---
eclass/java-pkg-simple.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index 97bad414afb7..e7fc422ebf25 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -367,7 +367,7 @@ java-pkg-simple_src_compile() {
# gather sources
# if target < 9, we need to compile module-info.java separately
# as this feature is not supported before Java 9
- if [[ java-pkg_get-target -lt 9 ]]; then
+ if [[ $(java-pkg_get-target) -lt 9 ]]; then
find "${JAVA_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${sources}
moduleinfo=$(find "${JAVA_SRC_DIR[@]}" -name module-info.java)
else
@@ -382,7 +382,7 @@ java-pkg-simple_src_compile() {
java-pkg-simple_getclasspath
java-pkg-simple_prepend_resources ${classes} "${JAVA_RESOURCE_DIRS[@]}"
- if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then
+ if [[ -n ${moduleinfo} ]] || [[ $(java-pkg_get-target) -lt 9 ]]; then
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${sources}
else
@@ -528,7 +528,7 @@ java-pkg-simple_src_test() {
# gathering sources for testing
# if target < 9, we need to compile module-info.java separately
# as this feature is not supported before Java 9
- if [[ java-pkg_get-target -lt 9 ]]; then
+ if [[ $(java-pkg_get-target) -lt 9 ]]; then
find "${JAVA_TEST_SRC_DIR[@]}" -name \*.java ! -name module-info.java > ${test_sources}
moduleinfo=$(find "${JAVA_TEST_SRC_DIR[@]}" -name module-info.java)
else
@@ -537,7 +537,7 @@ java-pkg-simple_src_test() {
# compile
if [[ -s ${test_sources} ]]; then
- if [[ -n ${moduleinfo} ]] || [[ java-pkg_get-target -lt 9 ]]; then
+ if [[ -n ${moduleinfo} ]] || [[ $(java-pkg_get-target) -lt 9 ]]; then
ejavac -d ${classes} -encoding ${JAVA_ENCODING}\
${classpath:+-classpath ${classpath}} ${JAVAC_ARGS} @${test_sources}
else
--
2.41.0