commit: f3004ab6ba4f86a4d38e6cc17e2300ec4e8c23a7 Author: Manuel Mommertz <manuel.mommertz <AT> desy <DOT> de> AuthorDate: Wed Jan 17 13:00:16 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Jan 19 12:43:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3004ab6
java-pkg-simple.eclass: make code related to java 9+ actually execute Signed-off-by: Manuel Mommertz <manuel.mommertz <AT> desy.de> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> eclass/java-pkg-simple.eclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 97bad414afb7..7bd2599a142d 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @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