update(openjdk^8)[2]

Author: jhheider

projects/openjdk.org/package.yml

@@ -67,8 +67,14 @@ build:
     - run:
         - BOOT_JDK_VERSION="${BOOT_JDK{{version.major}}_VERSION}"
         - BOOT_JDK_MAJOR=$(echo "${BOOT_JDK_VERSION}" | grep -o '^[0-9]\+')
+        - |
+          if test {{version.major}} = 8; then
+            BOOT_JDK_TAG_VERSION="jdk${BOOT_JDK_VERSION}"
+          else
+            BOOT_JDK_TAG_VERSION="jdk-${BOOT_JDK_VERSION}"
+          fi
         - BOOT_JDK_URL_VERSION="$(echo "${BOOT_JDK_VERSION}" | sed -e 's/\+/_/g' -e 's/-//g')"
-        - 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"
+        - BOOT_JDK_URL="https://github.com/adoptium/temurin${BOOT_JDK_MAJOR}-binaries/releases/download/${BOOT_JDK_TAG_VERSION}/OpenJDK${BOOT_JDK_MAJOR}U-jdk_${BOOT_JDK_ARCH}_hotspot_${BOOT_JDK_URL_VERSION}.tar.gz"
         - wget -c "${BOOT_JDK_URL}" -O - | tar xz -C . --strip-components=1
       working-directory: boot-jdk
     - run:
@@ -87,6 +93,21 @@ build:
             unset LLVM_VERSION_MAJOR LLVM_BIN_PATH PATH_WITHOUT_.LLVM
           fi
       if: <12
+    # remove unknown args
+    - run: export ARGS="$(echo -- $ARGS | sed -f $PROP)"
+      prop: |
+        s/--disable-warnings-as-errors//
+        s/--with-version-opt//
+        s/--with-version-pre//
+        s/--with-harfbuzz//
+        s/--with-lcms//
+        s/--with-libjpeg//
+        s/--with-libpng//
+        s/--disable-hotspot-gtest//
+        s/--with-jvm-features//
+        s/--with-version-build//
+        s/--with-vendor-version-string//
+      if: ^8
     - bash configure $ARGS
       --with-boot-jdk="$BOOT_JDK_DIR"
       --with-version-build=$(echo {{version.raw}} | grep -o '[0-9]\+$')
@@ -143,7 +164,7 @@ build:
     # https://github.com/adoptium/temurin11-binaries/releases
     BOOT_JDK11_VERSION: 11.0.22+7
     # https://github.com/adoptium/temurin8-binaries/releases
-    BOOT_JDK8_VERSION: 8u452b09
+    BOOT_JDK8_VERSION: 8u452-b09
 
     ARGS:
       - --disable-warnings-as-errors