commit: 85aa245ca7ec77f04b3a060b2e1628bacabdc076
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 22 21:27:18 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jul 22 21:31:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85aa245c
dev-java/jna: correct package phase for variable definition
Setting EANT_GENTOO_CLASSPATH_EXTRA in pkg_setup() causes binary
packages to die when being emerged. We set the variable by calling
java-pkg_getjars with jna build-only dependencies as argument, which
will not be available if a binary package is emerged.
Instead those variables, which are only needed when the package is
compiled, should be set in src_prepare().
Thanks to zorry for reporting this.
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Reported-by: Magnus Granberg <zorry <AT> gentoo.org>
dev-java/jna/{jna-5.11.0.ebuild => jna-5.11.0-r1.ebuild} | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-java/jna/jna-5.11.0.ebuild b/dev-java/jna/jna-5.11.0-r1.ebuild
similarity index 98%
rename from dev-java/jna/jna-5.11.0.ebuild
rename to dev-java/jna/jna-5.11.0-r1.ebuild
index 0d53024ae379..d1b4898f918a 100644
--- a/dev-java/jna/jna-5.11.0.ebuild
+++ b/dev-java/jna/jna-5.11.0-r1.ebuild
@@ -56,8 +56,8 @@ EANT_EXTRA_ARGS="-Dbuild-native=true -Dcompatibility=1.8
-Ddynlink.native=true"
EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=\"${T}\""
EANT_TEST_GENTOO_CLASSPATH="animal-sniffer-annotations,reflections"
-pkg_setup() {
- java-pkg-2_pkg_setup
+src_prepare() {
+ default
EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only \
animal-sniffer-annotations,ant-core,asm-9)"
@@ -68,10 +68,6 @@ pkg_setup() {
ANT_OPTS="-DCC='$(tc-getCC)' -DSTRIP='$(tc-getSTRIP)'"
# Parallel build does not respect dependency relationships between
objects
ANT_OPTS+=" -DEXTRA_MAKE_OPTS='${MAKEOPTS} -j1'"
-}
-
-src_prepare() {
- default
# Eliminate build.xml's dependency on bundled native JARs
sed -i -e '/zipfileset src="${lib.native}/,+2d' build.xml ||
