* [gentoo-dev] [PATCH] java-utils-2.eclass: select java-config binary, prefer java-config over java-config-2
@ 2024-07-27 10:16 Florian Schmaus
0 siblings, 0 replies; only message in thread
From: Florian Schmaus @ 2024-07-27 10:16 UTC (permalink / raw
To: gentoo-dev; +Cc: Florian Schmaus
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 <flow@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
--
2.44.2
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2024-07-27 10:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-27 10:16 [gentoo-dev] [PATCH] java-utils-2.eclass: select java-config binary, prefer java-config over java-config-2 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox