ivabus/pantry
1
0
Fork 0
mirror of https://github.com/ivabus/pantry synced 2024-11-22 08:25:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(openjdk^11)

Browse source
This commit is contained in:
Jacob Heider 2024-03-11 15:24:58 -04:00
parent ed28de6dcd
commit 7901ee0e30
No known key found for this signature in database
GPG key ID: 51E3FD0EE62677B6
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
projects/openjdk.org/package.yml
View file

@ -69,13 +69,16 @@ build:
ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release" ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release"
MAKE_ARGS+=" CONF=release" MAKE_ARGS+=" CONF=release"
LLVM_VERSION_MAJOR='12' # This is hacky, but it's necessary to version the LLVM dependency by openjdk version.
pkgx "+llvm.org^${LLVM_VERSION_MAJOR}" if test {{hw.platform}} = "linux"; then
LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")" LLVM_VERSION_MAJOR='12'
PATH_WITHOUT_LLVM="$(echo "${PATH}" | tr ':' '\n' | grep -v '/llvm.org/' | tr '\n' ':')" pkgx "+llvm.org^${LLVM_VERSION_MAJOR}"
export PATH="${LLVM_BIN_PATH}:${PATH_WITHOUT_LLVM}" LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")"
clang --version | grep "clang version ${LLVM_VERSION_MAJOR}" PATH_WITHOUT_LLVM="$(echo "${PATH}" | tr ':' '\n' | grep -v '/llvm.org/' | tr '\n' ':')"
unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM export PATH="${LLVM_BIN_PATH}:${PATH_WITHOUT_LLVM}"
clang --version | grep "clang version ${LLVM_VERSION_MAJOR}"
unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM
fi
if: <12 if: <12
- bash configure $ARGS - bash configure $ARGS
--with-boot-jdk="$BOOT_JDK_DIR" --with-boot-jdk="$BOOT_JDK_DIR"