diff options
| author |   Florian Schmaus <flow@gentoo.org> | 2022-07-22 23:27:18 +0200 |
|---|---|---|
| committer | Florian Schmaus <flow@gentoo.org> | 2022-07-22 23:31:37 +0200 |
| commit | 85aa245ca7ec77f04b3a060b2e1628bacabdc076 (patch) | |
| tree | 0f713684c2502d5f6a2552e188c311ef661ccdd8 /dev-java/jna | |
| parent | app-metrics/ceph_exporter: drop 3.0.0 (diff) | |
| download | gentoo-85aa245ca7ec77f04b3a060b2e1628bacabdc076.tar.gz gentoo-85aa245ca7ec77f04b3a060b2e1628bacabdc076.tar.bz2 gentoo-85aa245ca7ec77f04b3a060b2e1628bacabdc076.zip | |
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@gentoo.org>
Reported-by: Magnus Granberg <zorry@gentoo.org>
Diffstat (limited to 'dev-java/jna')
| -rw-r--r-- | dev-java/jna/jna-5.11.0-r1.ebuild (renamed from dev-java/jna/jna-5.11.0.ebuild) | 8 |
1 files 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 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 || |