openjdk: update to 8u322_b06 using icedtea-3.22.0

2 files changed, 18 insertions, 47 deletions

diff --git a/openjdk/build/BUILDING.txt b/openjdk/build/BUILDING.txt
index b3d93502..2da24cb3 100644
--- a/openjdk/build/BUILDING.txt
+++ b/openjdk/build/BUILDING.txt
@@ -4,8 +4,7 @@
 #
 # These source URLs are constructed from reading the
 # acinclude.m4 and Makefile.in of icedtea:
-# egrep '(^JDK_UPDATE_VERSION|^BUILD_VERSION)' acinclude.m4
-# egrep '(^CORBA_CHANGESET|^HOTSPOT_CHANGESET|^JAXP_CHANGESET|^JAXWS_CHANGESET|^JDK_CHANGESET|^LANGTOOLS_CHANGESET|^OPENJDK_CHANGESET|^CACAO_VERSION|^CACAO_BASE_URL|^JAMVM_VERSION|^JAMVM_BASE_URL|^ICEDTEA_MAJOR|^ICEDTEA_BRANCH|^ICEDTEA_PREFIX|^ICEDTEA_HG_URL|^DROP_URL)' Makefile.in
+# egrep '(^ *JDK_UPDATE_VERSION|^ *BUILD_VERSION)' acinclude.m4
 #
 # In icedtea you can choose between "default" and "zero" versions
 # of the VM. The zero vm is meant for ARM based systems.
@@ -16,8 +15,8 @@
 
 # Check ICEDTEA_BRANCH value in Makefile.in:
 ICEDTEA_MAJOR="icedtea8"
-ICEDTEA_BRANCH="3.21.0"
-ICEDTEA_VERSION="3.21.0"
+ICEDTEA_BRANCH="3.22.0"
+ICEDTEA_VERSION="3.22.0"
 DROPURL="http://icedtea.classpath.org/download/drops"
 SUPPURL="${DROPURL}/${ICEDTEA_MAJOR}/${ICEDTEA_BRANCH}"
 
@@ -25,31 +24,14 @@ SUPPURL="${DROPURL}/${ICEDTEA_MAJOR}/${ICEDTEA_BRANCH}"
 wget -c http://icedtea.classpath.org/download/source/icedtea-${ICEDTEA_VERSION}.tar.xz
 wget -c http://icedtea.classpath.org/download/source/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
 
+# Get supporting sources:
+wget ${SUPPURL}/openjdk-git.tar.xz -O openjdk_icedtea-${ICEDTEA_VERSION}.tar.xz
+
 # Extract Makefile.in:
 tar -O -xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/Makefile.in > Makefile.in
 
-# Get supporting sources:
-wget ${SUPPURL}/openjdk.tar.xz -O openjdk_icedtea-${ICEDTEA_VERSION}.tar.xz
-wget ${SUPPURL}/corba.tar.xz -O corba_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/jaxp.tar.xz -O jaxp_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/jdk.tar.xz -O jdk_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/langtools.tar.xz -O langtools_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/jaxws.tar.xz -O jaxws_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/hotspot.tar.xz -O hotspot_icedtea-${ICEDTEA_VERSION}.tar.xz 
-wget ${SUPPURL}/nashorn.tar.xz -O nashorn_icedtea-${ICEDTEA_VERSION}.tar.xz 
-
 # Get softwareversions from acinclude.m4:
-tar xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/acinclude.m4
-mv icedtea-${ICEDTEA_VERSION}/acinclude.m4 .
-# Get tarball hash values from Makefile.in:
-tar xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/Makefile.in
-mv icedtea-${ICEDTEA_VERSION}/Makefile.in .
-rmdir icedtea-${ICEDTEA_VERSION}
-egrep '^CACAO_VERSION|^JAMVM_VERSION' Makefile.in 
-CACAO_HASH=$(grep '^CACAO_VERSION' Makefile.in |tr -d ' ' |cut -d= -f2) 
-JAMVM_HASH=$(grep '^JAMVM_VERSION' Makefile.in |tr -d ' ' |cut -d= -f2) 
-wget ${DROPURL}/cacao/cacao-${CACAO_HASH}.tar.xz -O cacao_icedtea-${ICEDTEA_VERSION}.tar.xz
-wget ${DROPURL}/jamvm/jamvm-${JAMVM_HASH}.tar.gz -O jamvm_icedtea-${ICEDTEA_VERSION}.tar.gz
+tar -O -xvf icedtea-${ICEDTEA_VERSION}.tar.xz icedtea-${ICEDTEA_VERSION}/acinclude.m4 > acinclude.m4
 
 echo ==========================================================================
 gpg --verify  icedtea-${ICEDTEA_VERSION}.tar.xz.sig 2>&1 |grep -e "^gpg: .* signature from"
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild
index b80c746e..dd25e681 100755
--- a/openjdk/build/openjdk.SlackBuild
+++ b/openjdk/build/openjdk.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021  Eric Hameleers, Eindhoven, The Netherlands
+# Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022  Eric Hameleers, Eindhoven, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,15 @@
 
 PKGNAM1=openjdk
 PKGNAM2=openjre
-JAVAVER=8u312
-JAVABLD=b07
-ICEDTEA=3.21.0
+JAVAVER=8u322
+JAVABLD=b06
+ICEDTEA=3.22.0
 
 VERSION="${JAVAVER}_${JAVABLD}"
 BUILD=${BUILD:-1}
 TAG=${TAG:-"alien"}
 
-NUMJOBS=${NUMJOBS:-"-j$(nproc)" }
+NUMJOBS=${NUMJOBS:-" -j$(nproc) " }
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -51,15 +51,6 @@ DEBUGBUILD=${DEBUGBUILD:-"NO"}
 # for all of these tarballs; if the tarball does not verify then it will be
 # downloaded again:
 
-SRC_CACAO=cacao_icedtea-${ICEDTEA}.tar.gz
-SRC_JAMVM=jamvm_icedtea-${ICEDTEA}.tar.gz
-SRC_CORBA=corba_icedtea-${ICEDTEA}.tar.xz
-SRC_HOTSPOT=hotspot_icedtea-${ICEDTEA}.tar.xz
-SRC_JAXP=jaxp_icedtea-${ICEDTEA}.tar.xz
-SRC_JAXWS=jaxws_icedtea-${ICEDTEA}.tar.xz
-SRC_JDK=jdk_icedtea-${ICEDTEA}.tar.xz
-SRC_LANGTOOLS=langtools_icedtea-${ICEDTEA}.tar.xz
-SRC_NASHORN=nashorn_icedtea-${ICEDTEA}.tar.xz
 SRC_OPENJDK=openjdk_icedtea-${ICEDTEA}.tar.xz
 
 # Automatically determine the architecture we're building on:
@@ -79,6 +70,11 @@ if [ "$ARCH" = "i486" ]; then
   LIBDIRSUFFIX=""
   LIB_ARCH=i386
   ARCH_OPTS=" --disable-jamvm "
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+  LIB_ARCH=i386
+  ARCH_OPTS=" --disable-jamvm "
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -161,7 +157,7 @@ fi
 
 export ANT_HOME=/usr/share/ant
 export ALT_FREETYPE_LIB_PATH=/usr/lib${LIBDIRSUFFIX}
-export ALT_PARALLEL_COMPILE_JOBS="${NUMJOBS/-j}"
+#export ALT_PARALLEL_COMPILE_JOBS="${NUMJOBS/-j}"
 export BUILD_NUMBER=$JAVABLD
 export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 export LANG=C
@@ -179,13 +175,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-abs-install-dir=/usr/lib${LIBDIRSUFFIX}/java \
   --with-pkgversion=Slackware \
   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-  --with-corba-src-zip=$CWD/sources/${SRC_CORBA} \
-  --with-hotspot-src-zip=$CWD/sources/${SRC_HOTSPOT} \
-  --with-jaxp-src-zip=$CWD/sources/${SRC_JAXP} \
-  --with-jaxws-src-zip=$CWD/sources/${SRC_JAXWS} \
-  --with-jdk-src-zip=$CWD/sources/${SRC_JDK} \
-  --with-langtools-src-zip=$CWD/sources/${SRC_LANGTOOLS} \
-  --with-nashorn-src-zip=$CWD/sources/${SRC_NASHORN} \
   --with-openjdk-src-zip=$CWD/sources/${SRC_OPENJDK} \
   --with-jdk-home=${JVMDIR} \
   --disable-docs \