mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-27 16:41:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

eclass/java-utils-2: Sync with Gentoo

Browse Source 
It's from Gentoo commit 7eddfd1f9b69da3a97fb5b6b3781a6a31feaa59a.
This commit is contained in:
Flatcar Buildbot 2024-07-29 07:15:34 +00:00 committed by Krzesimir Nowak
parent 8bf25b4b83
commit cbefa5b473
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_container/src/third_party/portage-stable/eclass/java-utils-2.eclass vendored
View File

@ -1838,7 +1838,7 @@ ejunit_() {
local junit=${1} local junit=${1}
shift 1 shift 1
local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs}) local cp=$(java-pkg_getjars --build-only --with-dependencies ${junit}${pkgs})
if [[ ${1} = -cp || ${1} = -classpath ]]; then if [[ ${1} = -cp || ${1} = -classpath ]]; then
cp="${2}:${cp}" cp="${2}:${cp}"
shift 2 shift 2
@ -2723,7 +2723,13 @@ java-pkg_build-vm-from-handle() {
fi fi
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do 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} echo ${vm}
return 0 return 0
fi fi