From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 25 Apr 2020 09:34:55 +0000 (-0700)
Subject: dev-java/swt: add openjdk11 libjawt.so  path
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f239e95ecddb44dc379f9c12be10b0a36e2dd0c1;p=gentoo.git

dev-java/swt: add openjdk11 libjawt.so  path

Closes: https://bugs.gentoo.org/689976
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
index f7fa9be7233a..4559e6bb888c 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -96,6 +96,8 @@ src_compile() {
 		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
 	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
 		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/lib"
 	else
 		eerror "${JAWTSO} not found in the JDK being used for compilation!"
 		die "cannot build AWT library"