Gentoo Archives: gentoo-dev

From: "Volkmar W. Pogatzki" <gentoo@××××××××.net>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] java-pkg-simple.eclass: do not java-pkg_gen-cp if USE=binary
Date: Fri, 29 Jul 2022 09:44:28
Message-Id: 20220729094402.1138-1-gentoo@pogatzki.net
1 Closes: https://bugs.gentoo.org/861026
2 Signed-off-by: Volkmar W. Pogatzki <gentoo@××××××××.net>
3 ---
4 eclass/java-pkg-simple.eclass | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7 diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
8 index 09062d9ede6..6f7324240e3 100644
9 --- a/eclass/java-pkg-simple.eclass
10 +++ b/eclass/java-pkg-simple.eclass
11 @@ -344,9 +344,6 @@ java-pkg-simple_prepend_resources() {
12 java-pkg-simple_src_compile() {
13 local sources=sources.lst classes=target/classes apidoc=target/api moduleinfo
14
15 - # auto generate classpath
16 - java-pkg_gen-cp JAVA_GENTOO_CLASSPATH
17 -
18 # do not compile if we decide to install binary jar
19 if has binary ${JAVA_PKG_IUSE} && use binary; then
20 # register the runtime dependencies
21 @@ -357,6 +354,9 @@ java-pkg-simple_src_compile() {
22 cp "${DISTDIR}"/${JAVA_BINJAR_FILENAME} ${JAVA_JAR_FILENAME}\
23 || die "Could not copy the binary jar file to ${S}"
24 return 0
25 + else
26 + # auto generate classpath
27 + java-pkg_gen-cp JAVA_GENTOO_CLASSPATH
28 fi
29
30 # gather sources
31 --
32 2.35.1