From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1E68158094 for ; Fri, 22 Jul 2022 21:32:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C771E01E4; Fri, 22 Jul 2022 21:32:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D2B4DE0391 for ; Fri, 22 Jul 2022 21:32:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1603F341064 for ; Fri, 22 Jul 2022 21:32:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D02B52B for ; Fri, 22 Jul 2022 21:31:59 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1658525497.85aa245ca7ec77f04b3a060b2e1628bacabdc076.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jna/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/jna/jna-5.11.0-r1.ebuild dev-java/jna/jna-5.11.0.ebuild X-VCS-Directories: dev-java/jna/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 85aa245ca7ec77f04b3a060b2e1628bacabdc076 X-VCS-Branch: master Date: Fri, 22 Jul 2022 21:31:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e6a36b3-e4c2-45fe-9f99-0b6e9e511e73 X-Archives-Hash: bea57fb83836cab952aabebdc196fdd4 commit: 85aa245ca7ec77f04b3a060b2e1628bacabdc076 Author: Florian Schmaus gentoo org> AuthorDate: Fri Jul 22 21:27:18 2022 +0000 Commit: Florian Schmaus gentoo 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 gentoo.org> Reported-by: Magnus Granberg 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 ||