commit: 61f4303bb92f22c65c803763e8f4a29b5a8bd2b3 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Jul 29 09:36:29 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Aug 2 11:45:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f4303b
java-pkg-simple.eclass: run java-pkg_gen-cp only for non-binary packages app-misc/rundeck-cli-bin-2.0.1 failed to build with openjdk-jre-bin-17 saying "javac is not available for openjdk-jre-bin-17 on x86_64". Culprit was java-pkg-simple.eclass calling java-pkg_gen-cp unconditionally. Limiting java-pkg_gen-cp to the "non-binary" case solves the problem. Closes: https://bugs.gentoo.org/861026 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/26647 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> eclass/java-pkg-simple.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 09062d9ede68..6f7324240e34 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -344,9 +344,6 @@ java-pkg-simple_prepend_resources() { java-pkg-simple_src_compile() { local sources=sources.lst classes=target/classes apidoc=target/api moduleinfo - # auto generate classpath - java-pkg_gen-cp JAVA_GENTOO_CLASSPATH - # do not compile if we decide to install binary jar if has binary ${JAVA_PKG_IUSE} && use binary; then # register the runtime dependencies @@ -357,6 +354,9 @@ java-pkg-simple_src_compile() { cp "${DISTDIR}"/${JAVA_BINJAR_FILENAME} ${JAVA_JAR_FILENAME}\ || die "Could not copy the binary jar file to ${S}" return 0 + else + # auto generate classpath + java-pkg_gen-cp JAVA_GENTOO_CLASSPATH fi # gather sources
