commit: 6b6e5f4bb0c7a31aed89adad2e5bb818a13d10e7
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Nov 10 15:46:08 2022 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Nov 10 15:47:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b6e5f4b
net-libs/td: java fixup
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-libs/td/td-1.8.0.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net-libs/td/td-1.8.0.ebuild b/net-libs/td/td-1.8.0.ebuild
index 3d6ce62e2..898dbeaa8 100644
--- a/net-libs/td/td-1.8.0.ebuild
+++ b/net-libs/td/td-1.8.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="
dev-libs/openssl:=
sys-libs/zlib:=
dotnet? ( virtual/dotnet-sdk:* )
- java? ( virtual/jdk:*[-headless-awt] )
+ java? ( >=virtual/jdk-11:*[-headless-awt] )
"
RDEPEND="${DEPEND}"
BDEPEND="
@@ -65,9 +65,8 @@ src_configure() {
)
if use java; then
- local JAVA_HOME=$(java-config -O)
- local JAVA_AWT_LIBRARY=$(echo
"${JAVA_HOME}"/jre/lib/*/libjawt.so)
- local JAVA_JVM_LIBRARY=$(echo
"${JAVA_HOME}"/jre/lib/*/libjava.so)
+ local JAVA_AWT_LIBRARY="${JAVA_HOME}/lib/libjawt.so"
+ local JAVA_JVM_LIBRARY="${JAVA_HOME}/lib/libjava.so"
mycmakeargs+=(
-DTD_ENABLE_JNI=ON
