mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
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>
This commit is contained in:
@@ -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 ||
|
||||
Reference in New Issue
Block a user