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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE612158094 for ; Sun, 14 Aug 2022 15:11:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3E05E09BF; Sun, 14 Aug 2022 15:11:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 C5EB2E09BF for ; Sun, 14 Aug 2022 15:11:27 +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 84DA334153C for ; Sun, 14 Aug 2022 15:11:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9BE253F for ; Sun, 14 Aug 2022 15:11:24 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1660489455.58d57494d68c409a3844cbbfd091304bc5efda43.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/cxprolog/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/cxprolog/cxprolog-0.98.2.ebuild X-VCS-Directories: dev-lang/cxprolog/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: 58d57494d68c409a3844cbbfd091304bc5efda43 X-VCS-Branch: master Date: Sun, 14 Aug 2022 15:11:24 +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: 725153da-87d8-4353-acd4-e8b2cff26a7a X-Archives-Hash: 6c70b504c0bebbd68b3f810ccf805e06 commit: 58d57494d68c409a3844cbbfd091304bc5efda43 Author: Keri Harris gentoo org> AuthorDate: Sun Aug 14 15:04:15 2022 +0000 Commit: Keri Harris gentoo org> CommitDate: Sun Aug 14 15:04:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d57494 dev-lang/cxprolog: support building with JDK 11 Closes: https://bugs.gentoo.org/855206 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Keri Harris gentoo.org> dev-lang/cxprolog/cxprolog-0.98.2.ebuild | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild index 3c949317f178..aea94ab537f6 100644 --- a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild +++ b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/${P}.src.tgz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="examples java +readline test wxwidgets" RESTRICT="!test? ( test )" @@ -59,7 +59,10 @@ src_compile() { local java_arch use x86 && java_arch=i386 use amd64 && java_arch=amd64 - CX_JVM="${JAVA_HOME}/jre/lib/${java_arch}/server" + local CX_JVM + for i in jre/lib/${java_arch}/server lib/server; do + [[ -f ${JAVA_HOME}/${i}/libjvm.so ]] && CX_JVM=${JAVA_HOME}/${i} + done CX_EXT_DEFINES="$CX_EXT_DEFINES -DUSE_JAVA" CX_EXT_CFLAGS="$CX_EXT_CFLAGS $(java-pkg_get-jni-cflags)" CX_EXT_LDFLAGS="$CX_EXT_LDFLAGS -Wl,-rpath,${CX_JVM}"