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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75522138350 for ; Sat, 25 Apr 2020 09:35:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF94BE0986; Sat, 25 Apr 2020 09:35:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99C02E0986 for ; Sat, 25 Apr 2020 09:35:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2BBFF34F05B for ; Sat, 25 Apr 2020 09:35:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6F2B1C5 for ; Sat, 25 Apr 2020 09:35:35 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1587807317.f239e95ecddb44dc379f9c12be10b0a36e2dd0c1.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/swt/swt-4.10.ebuild X-VCS-Directories: dev-java/swt/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: f239e95ecddb44dc379f9c12be10b0a36e2dd0c1 X-VCS-Branch: master Date: Sat, 25 Apr 2020 09:35:35 +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: 8d40dae8-4d79-48a2-a6b0-4efd62a2b53a X-Archives-Hash: 61f8476c4ff61dfd0f67f16908244bfe commit: f239e95ecddb44dc379f9c12be10b0a36e2dd0c1 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Apr 25 09:34:55 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Apr 25 09:35:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f239e95e 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 gentoo.org> dev-java/swt/swt-4.10.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index f7fa9be7233..4559e6bb888 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"