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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58BF3159C96 for ; Sun, 28 Jul 2024 17:40:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84C4EE2AA3; Sun, 28 Jul 2024 17:40:17 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6786FE2AA3 for ; Sun, 28 Jul 2024 17:40:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7FFBF335CB4 for ; Sun, 28 Jul 2024 17:40:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0FE71DC5 for ; Sun, 28 Jul 2024 17:40:14 +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: <1722188397.7eddfd1f9b69da3a97fb5b6b3781a6a31feaa59a.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/java-utils-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 7eddfd1f9b69da3a97fb5b6b3781a6a31feaa59a X-VCS-Branch: master Date: Sun, 28 Jul 2024 17:40:14 +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: b4029eb8-8074-468c-ba91-c6546681fddd X-Archives-Hash: c9a783cbcdaef72b2a46dc9dd9594633 commit: 7eddfd1f9b69da3a97fb5b6b3781a6a31feaa59a Author: Florian Schmaus gentoo org> AuthorDate: Sat Jul 27 10:12:24 2024 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Sun Jul 28 17:39:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eddfd1f java-utils-2.eclass: select java-config binary, prefer java-config over java-config-2 This prepares the eclass for the transition from /usr/bin/java-config-2 to /usr/bin/java-config. Starting with dev-java/java-config-2.3.3, the java-config utility is installed as java-config and the java-config-2 compatibility symlink will only be installed if the 'compat' USE flag is enabled (currently the default). Signed-off-by: Florian Schmaus gentoo.org> eclass/java-utils-2.eclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 8a062f2ad87e..559342068cc0 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -2723,7 +2723,13 @@ java-pkg_build-vm-from-handle() { fi for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if java-config-2 --select-vm=${vm} 2>/dev/null; then + local java_config + for java_config in java-config{,-2}; do + type -p ${java_config} >/dev/null && break + done + [[ -z ${java_config} ]] && die "No java-config binary in PATH" + + if ${java_config} --select-vm=${vm} 2>/dev/null; then echo ${vm} return 0 fi