commit: 58d57494d68c409a3844cbbfd091304bc5efda43 Author: Keri Harris <keri <AT> gentoo <DOT> org> AuthorDate: Sun Aug 14 15:04:15 2022 +0000 Commit: Keri Harris <keri <AT> gentoo <DOT> 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 <keri <AT> 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}"
