diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2022-07-29 11:36:29 +0200 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2022-08-02 13:45:28 +0200 |
| commit | 61f4303bb92f22c65c803763e8f4a29b5a8bd2b3 (patch) | |
| tree | e1fce681ffa959899bb66fb40f9436b8b8450819 | |
| parent | sci-libs/linux-gpib-modules: Fix build if modules dir does not exist yet (diff) | |
| download | gentoo-61f4303bb92f22c65c803763e8f4a29b5a8bd2b3.tar.gz gentoo-61f4303bb92f22c65c803763e8f4a29b5a8bd2b3.tar.bz2 gentoo-61f4303bb92f22c65c803763e8f4a29b5a8bd2b3.zip | |
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@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26647
Signed-off-by: Florian Schmaus <flow@gentoo.org>
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 6 |
1 files 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 |