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 D6CF0139337 for ; Wed, 28 Jul 2021 19:53:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDB3AE0984; Wed, 28 Jul 2021 19:53:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9116CE0984 for ; Wed, 28 Jul 2021 19:53:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0B67D342C2A for ; Wed, 28 Jul 2021 19:53:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BCA8737 for ; Wed, 28 Jul 2021 19:53:03 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1627501931.16b7cf5e72b6255564733656746c76421b776b0a.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/zstd-jni/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild X-VCS-Directories: dev-java/zstd-jni/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 16b7cf5e72b6255564733656746c76421b776b0a X-VCS-Branch: master Date: Wed, 28 Jul 2021 19:53:03 +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: 2df6c356-d310-440c-806c-ebf8c880b541 X-Archives-Hash: 101769465ef5ce393b51f5e5518d444a commit: 16b7cf5e72b6255564733656746c76421b776b0a Author: Yuan Liao gmail com> AuthorDate: Wed Jul 28 15:03:03 2021 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Jul 28 19:52:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b7cf5e dev-java/zstd-jni: Allow CMake to find and use JNI without AWT The AWT library, libjawt.so, is not needed for zstd-jni itself as the compilation can finish without it. But CMake's FindJNI module will always try to search for it, and if it is not found, CMake will declare everything pertaining to JNI unavailable, even if some of the JNI components do exist on the system -- like jni.h, which is required for building zstd-jni. Because the AWT library is actually unused, it is safe to set the CMake variable controlling it (JAVA_AWT_LIBRARY) to an arbitrary string for deceiving CMake about its existence. Closes: https://bugs.gentoo.org/776910 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Yuan Liao gmail.com> Closes: https://github.com/gentoo/gentoo/pull/21816 Signed-off-by: Florian Schmaus gentoo.org> dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild | 3 +++ dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild index 6428adfaaec..91f20179a56 100644 --- a/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild +++ b/dev-java/zstd-jni/zstd-jni-1.4.9.1.ebuild @@ -26,6 +26,9 @@ JAVA_SRC_DIR="src/main/java" src_configure() { local mycmakeargs=( -DJAVA_HOME="$(java-config -g JAVA_HOME)" + # Resolve bug #776910 + # Reference: https://stackoverflow.com/a/51764145 + -DJAVA_AWT_LIBRARY="NotNeeded" ) cmake_src_configure } diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild index 116244dc24e..d978a25ba29 100644 --- a/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild +++ b/dev-java/zstd-jni/zstd-jni-1.5.0.4.ebuild @@ -37,6 +37,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DJAVA_HOME="$(java-config -g JAVA_HOME)" + # Resolve bug #776910 + # Reference: https://stackoverflow.com/a/51764145 + -DJAVA_AWT_LIBRARY="NotNeeded" ) cmake_src_configure }