Skip to content

Commit 8d99e53

Browse files
committed
update(openjdk8)
closes #9745
1 parent f7ce0f6 commit 8d99e53

File tree

1 file changed

+34
-24
lines changed

1 file changed

+34
-24
lines changed

projects/openjdk.org/package.yml

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ distributable:
66
strip-components: 1
77
- url: https://github.com/openjdk/jdk11u/archive/{{version.tag}}.tar.gz
88
strip-components: 1
9+
- url: https://github.com/openjdk/jdk8u/archive/{{version.tag}}.tar.gz
10+
strip-components: 1
911

1012
versions:
1113
# each repo contains all the prior repo tags at the time of the fork,
@@ -17,6 +19,10 @@ versions:
1719
transform: 'v => v.match(/jdk-17\.0\./) ? v.replace(/\+/, ".").replace(/^jdk-/, "") : undefined'
1820
- github: openjdk/jdk11u/tags
1921
transform: 'v => v.match(/jdk-11\.0\./) ? v.replace(/\+/, ".").replace(/^jdk-/, "") : undefined'
22+
# v8 uses tags like jdk8u452-b09, which should be 8.0.452.09
23+
# it also have no darwin/aarch64 support, which we'll need to accept.
24+
- github: openjdk/jdk8u/tags
25+
transform: 'v => v.match(/jdk8u/) ? v.replace("jdk", "").replace("u", ".0.").replace("-b", ".") : undefined'
2026

2127
interprets:
2228
extensions: java
@@ -58,27 +64,28 @@ build:
5864
freedesktop.org/pkg-config: '*'
5965
gnu.org/wget: '*'
6066
script:
61-
- run: |
62-
BOOT_JDK_VERSION="${BOOT_JDK{{version.major}}_VERSION}"
63-
BOOT_JDK_MAJOR=$(echo "${BOOT_JDK_VERSION}" | grep -o '^[0-9]\+')
64-
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"
65-
wget -c "${BOOT_JDK_URL}" -O - | tar xz -C . --strip-components=1
66-
unset BOOT_JDK_VERSION BOOT_JDK_MAJOR BOOT_JDK_URL
67+
- run:
68+
- BOOT_JDK_VERSION="${BOOT_JDK{{version.major}}_VERSION}"
69+
- BOOT_JDK_MAJOR=$(echo "${BOOT_JDK_VERSION}" | grep -o '^[0-9]\+')
70+
- BOOT_JDK_URL_VERSION="$(echo "${BOOT_JDK_VERSION}" | sed -e 's/\+/_/g' -e 's/-//g')"
71+
- 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_URL_VERSION}.tar.gz"
72+
- wget -c "${BOOT_JDK_URL}" -O - | tar xz -C . --strip-components=1
6773
working-directory: boot-jdk
68-
- run: |
69-
ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release"
70-
MAKE_ARGS+=" CONF=release"
74+
- run:
75+
- ARGS+=" --disable-hotspot-gtest --with-jvm-features=shenandoahgc --with-conf-name=release"
76+
- MAKE_ARGS+=" CONF=release"
7177

7278
# This is hacky, but it's necessary to version the LLVM dependency by openjdk version.
73-
if test {{hw.platform}} = "linux"; then
74-
LLVM_VERSION_MAJOR='12'
75-
pkgx "+llvm.org^${LLVM_VERSION_MAJOR}"
76-
LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")"
77-
PATH_WITHOUT_LLVM="$(echo "${PATH}" | tr ':' '\n' | grep -v '/llvm.org/' | tr '\n' ':')"
78-
export PATH="${LLVM_BIN_PATH}:${PATH_WITHOUT_LLVM}"
79-
clang --version | grep "clang version ${LLVM_VERSION_MAJOR}"
80-
unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM
81-
fi
79+
- |
80+
if test {{hw.platform}} = "linux"; then
81+
LLVM_VERSION_MAJOR='12'
82+
pkgx "+llvm.org^${LLVM_VERSION_MAJOR}"
83+
LLVM_BIN_PATH="$(realpath "{{deps.llvm.org.prefix}}/../v${LLVM_VERSION_MAJOR}/bin")"
84+
PATH_WITHOUT_LLVM="$(echo "${PATH}" | tr ':' '\n' | grep -v '/llvm.org/' | tr '\n' ':')"
85+
export PATH="${LLVM_BIN_PATH}:${PATH_WITHOUT_LLVM}"
86+
clang --version | grep "clang version ${LLVM_VERSION_MAJOR}"
87+
unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM
88+
fi
8289
if: <12
8390
- bash configure $ARGS
8491
--with-boot-jdk="$BOOT_JDK_DIR"
@@ -90,13 +97,14 @@ build:
9097
- make images $MAKE_ARGS
9198
- mkdir -p {{prefix}}
9299
- mv $JDK_DIR {{prefix}}/
93-
- run: |
100+
- run:
94101
# jni.h:45:10: fatal error: 'jni_md.h' file not found
95-
if test -d {{ hw.platform }}; then
96-
mv {{ hw.platform }}/* .
97-
rmdir {{ hw.platform }}
98-
ln -s . {{ hw.platform }}
99-
fi
102+
- |
103+
if test -d {{ hw.platform }}; then
104+
mv {{ hw.platform }}/* .
105+
rmdir {{ hw.platform }}
106+
ln -s . {{ hw.platform }}
107+
fi
100108
working-directory: ${{prefix}}/include
101109
env:
102110
MAKE_ARGS: 'JOBS={{ hw.concurrency }}'
@@ -134,6 +142,8 @@ build:
134142
BOOT_JDK17_VERSION: 17.0.9+9
135143
# https://github.com/adoptium/temurin11-binaries/releases
136144
BOOT_JDK11_VERSION: 11.0.22+7
145+
# https://github.com/adoptium/temurin8-binaries/releases
146+
BOOT_JDK8_VERSION: 8u452b09
137147

138148
ARGS:
139149
- --disable-warnings-as-errors

0 commit comments

Comments
 (0)