Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
Date: Sat, 25 Apr 2020 09:35:40
Message-Id: 1587807317.f239e95ecddb44dc379f9c12be10b0a36e2dd0c1.gyakovlev@gentoo
1 commit: f239e95ecddb44dc379f9c12be10b0a36e2dd0c1
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 25 09:34:55 2020 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 09:35:17 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f239e95e
7
8 dev-java/swt: add openjdk11 libjawt.so path
9
10 Closes: https://bugs.gentoo.org/689976
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 dev-java/swt/swt-4.10.ebuild | 4 +++-
15 1 file changed, 3 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
18 index f7fa9be7233..4559e6bb888 100644
19 --- a/dev-java/swt/swt-4.10.ebuild
20 +++ b/dev-java/swt/swt-4.10.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2019 Gentoo Authors
23 +# Copyright 1999-2020 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -96,6 +96,8 @@ src_compile() {
28 export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
29 elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
30 export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
31 + elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
32 + export AWT_LIB_PATH="${JAVA_HOME}/lib"
33 else
34 eerror "${JAWTSO} not found in the JDK being used for compilation!"
35 die "cannot build AWT library"