mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
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>
This commit is contained in:
committed by
Florian Schmaus
parent
ae706e6aa4
commit
61f4303bb9
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user