Skip to content

fix(openjdk.org@11) #5530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhheider merged 1 commit into from
Mar 10, 2024
Merged

fix(openjdk.org@11) #5530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion projects/openjdk.org/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ runtime:
build:
dependencies:
linux:
llvm.org: <16 # due to jdk11, jdk17+ compiles with llvm.org <17
llvm.org: ^16
gnu.org/make: '*'
gnu.org/autoconf: '*'
freedesktop.org/pkg-config: '*'
Expand All @@ -63,10 +63,19 @@ build:
BOOT_JDK_MAJOR=$(echo "${BOOT_JDK_VERSION}" | grep -o '^[0-9]\+')
BOOT_JDK_URL="https://github.com/adoptium/temurin${BOOT_JDK_MAJOR}-binaries/releases/download/jdk-${BOOT_JDK_VERSION}/OpenJDK${BOOT_JDK_MAJOR}U-jdk_${BOOT_JDK_ARCH}_hotspot_${BOOT_JDK_VERSION//+/_}.tar.gz"
wget -c "${BOOT_JDK_URL}" -O - | tar xz -C . --strip-components=1
unset BOOT_JDK_VERSION BOOT_JDK_MAJOR BOOT_JDK_URL
working-directory: boot-jdk
- run: |
ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release"
MAKE_ARGS+=" CONF=release"

LLVM_VERSION_MAJOR='12'
pkgx "+llvm.org^${LLVM_VERSION_MAJOR}"
LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")"
PATH_WITHOUT_LLVM="$(echo "${PATH}" | tr ':' '\n' | grep -v '/llvm.org/' | tr '\n' ':')"
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
if: <12
- bash configure $ARGS
--with-boot-jdk="$BOOT_JDK_DIR"
Expand Down