3 files changed, 20 insertions, 12 deletions
diff --git a/development/OpenJDK21/OpenJDK21.SlackBuild b/development/OpenJDK21/OpenJDK21.SlackBuild
index b29ce0a8cd..90ca8eac55 100644
--- a/development/OpenJDK21/OpenJDK21.SlackBuild
+++ b/development/OpenJDK21/OpenJDK21.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=OpenJDK21
-VERSION=${VERSION:-21.0.6}
+VERSION=${VERSION:-21.0.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -134,12 +134,12 @@ sh configure \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-giflib=system \
-  --with-harfbuzz=system \
-  --with-lcms=system \
-  --with-libjpeg=system \
-  --with-libpng=system \
-  --with-zlib=system \
+  --with-giflib=bundled \
+  --with-harfbuzz=bundled \
+  --with-lcms=bundled \
+  --with-libjpeg=bundled \
+  --with-libpng=bundled \
+  --with-zlib=bundled \
   --disable-precompiled-headers \
   --enable-libffi-bundling \
   --enable-unlimited-crypto \
diff --git a/development/OpenJDK21/OpenJDK21.info b/development/OpenJDK21/OpenJDK21.info
index df1bd86db7..ec9142442e 100644
--- a/development/OpenJDK21/OpenJDK21.info
+++ b/development/OpenJDK21/OpenJDK21.info
@@ -1,16 +1,16 @@
 PRGNAM="OpenJDK21"
-VERSION="21.0.6"
+VERSION="21.0.8"
 HOMEPAGE="https://openjdk.java.net/"
-DOWNLOAD="https://github.com/openjdk/jdk21u/archive/jdk-21.0.6-ga/jdk21u-jdk-21.0.6-ga.tar.gz \
+DOWNLOAD="https://github.com/openjdk/jdk21u/archive/jdk-21.0.8-ga/jdk21u-jdk-21.0.8-ga.tar.gz \
           http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-20.0.2-ga-linux-i586-bin.tar.xz \
           https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz"
-MD5SUM="7ac8510dff42d389a83d19c946a72afd \
+MD5SUM="766bb59acbe2367848612dcade7ed0c5 \
         5003cd54ea62d4f10e2f1cfa6dfae890 \
         0038551ecaf37d0cd99832217f79e56d"
-DOWNLOAD_x86_64="https://github.com/openjdk/jdk21u/archive/jdk-21.0.6-ga/jdk21u-jdk-21.0.6-ga.tar.gz \
+DOWNLOAD_x86_64="https://github.com/openjdk/jdk21u/archive/jdk-21.0.8-ga/jdk21u-jdk-21.0.8-ga.tar.gz \
                  http://www.lenardspencer.net/linux/slackbuilds/OpenJDK-bootstraps/OpenJDK-20.0.2-ga-linux-x86_64-bin.tar.xz \
                  https://anduin.linuxfromscratch.org/BLFS/OpenJDK/OpenJDK-21.0.2/jtreg-7.3.1+1.tar.gz"
-MD5SUM_x86_64="7ac8510dff42d389a83d19c946a72afd \
+MD5SUM_x86_64="766bb59acbe2367848612dcade7ed0c5 \
                ac9a6afd411d7206c94d23a86d8b1cd3 \
                0038551ecaf37d0cd99832217f79e56d"
 REQUIRES=""
diff --git a/development/OpenJDK21/README b/development/OpenJDK21/README
index 2a42e2f8b5..745d2ef8df 100644
--- a/development/OpenJDK21/README
+++ b/development/OpenJDK21/README
@@ -2,6 +2,9 @@ OpenJDK21 is an open source implementation of version 21 (LTS) of the
 Java Development Kit, Standard Edition. It includes tools for
 developing, testing, and running programs written in Java.
 
+This is a GA release.  Any builds you see with a designation +<number>
+are actually beta releases leading up to the GA release.
+
 This script builds the package from source using the packages listed
 in the .info file (the source tarball plus a binary of the prevous
 version to bootstrap from), so it is not necessary to have a jdk
@@ -35,3 +38,8 @@ BIG FAT NOTE: If you have ANY JDK installed (jdk, zulu-openjdk,
 OpenJDK, etc.), you MUST first uninstall it, then logout/login to
 clear the JAVA_HOME folder from your $PATH in order to build this
 package, otherwise the build will fail.
+
+BIG FAT NOTE 2:  This will currently not build in current, so all
+parameters with '=system' have been changed to '=bundled'.  This way,
+the package built in 15.0 will run in -current. (Upstream is aware of
+the issue.)