development/openjdk7: Updated for version 7u321 + new main.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 53 insertions, 53 deletions

diff --git a/development/openjdk7/README b/development/openjdk7/README
index c0a5183f10..b32c246c92 100644
--- a/development/openjdk7/README
+++ b/development/openjdk7/README
@@ -1,32 +1,24 @@
-OpenJDK 7 is an open source implementation of version 7 of the Java
-Development Kit, Standard Edition. It includes tools for developing,
-testing, and running programs written in Java.
+OpenJDK 7 is an open source implementation of version 7 of the
+Java Development Kit, Standard Edition.  It includes tools for
+developing, testing, and running programs written in Java.
 
-apache-ant is a required dependency and you have to install it before
-you build 'openjdk7'. However, you do not need to install Oracle's jdk,
-since it's only a runtime dependency of apache-ant.
+This build requires both apache-ant and gcc5.  You do NOT need to
+install Oracle's jdk, as apache-ant will work just fine with the jvm
+tools in gcc5.
 
 Before installing this package please consider any other jdk's/jre's
 that you have already installed as they may cause conflicts with the
 PATH, JAVA_HOME and MANPATH variables.
 
-After installing the package you will need to logout/reboot your
+After installing the package you will need to logout/login to your
 machine as it will add new files to the /etc/profile.d folder.
 
 This script may take a couple of hours to complete and will require
-about 11 GB of disk space for its temporary directory. It defaults to
+about 9 GB of disk space for its temporary directory.  It defaults to
 "/tmp/SBo" and you may redefine it like this:
 
 TMP=/your/temporary/dir ./openjdk7.SlackBuild
 
-The 'cacerts' binary is a TrustStore containing CA certificates which
-are used by Java applications. It is taken from the CentOS package
+The 'cacerts' binary is a keystore containing CA certificates which
+are used by Java applications.  It is taken from the CentOS package
 'ca-certificates-2015.2.4-65.0.1.el6_6.noarch.rpm'.
-
-If you get an error like
-
-Internal compiler error: java.lang.NullPointerException at
-org.eclipse.jdt.internal.compiler.ReadManager.run(ReadManager.java:166)
-
-simply run the build again. This happens early so it shouldn't be that
-of a problem. At least 1 out of 5 runs so far have always succeded.
diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild
index c5046bc536..44c1f4a75d 100644
--- a/development/openjdk7/openjdk7.SlackBuild
+++ b/development/openjdk7/openjdk7.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for OpenJDK
 
 # Copyright 2020 Strahil Yordanov, Sofia, Bulgaria
+# Copyright 2021 Lenard Spencer, Orlando, Florida, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -43,6 +44,9 @@ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.jav
  
 EOF
 
+# Remove the sys/sysctl.h includes (they weren't being used anyway)
+	sed -i '/sys\/sysctl.h/d' src/solaris/native/java/net/PlainDatagramSocketImpl.c
+	sed -i '/sys\/sysctl.h/d' src/solaris/native/java/net/PlainSocketImpl.c
 	cd ..
 	tar -cvjSf jdk.tar.bz2 jdk-*
 }
@@ -56,16 +60,16 @@ function fixJdkArchiveChecksum() {
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openjdk7
-VERSION=${VERSION:-7u271}
+VERSION=${VERSION:-7u321}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 DVER=1.7.0_$(printf $VERSION | cut -du -f2)
-ICEDTEA=icedtea-2.6.23
+ICEDTEA=icedtea-2.6.28
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm; echo "Unsupported arch $ARCH"; exit 1;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -93,6 +97,15 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Check for the gcc5 package, and abort if not found:
+if [ ! -x /usr/bin/gcc-5 ]; then
+  echo "This requires the gcc5 package to build."
+  echo "Please install gcc5 and rerun this script."
+  exit 1
+else
+  source /etc/profile.d/gcc5.sh # Set the environment
+fi
+
 BOOT_JAVA=/usr/lib${LIBDIRSUFFIX}/jvm
 
 set -e
@@ -118,6 +131,7 @@ JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH ../$ICEDTEA/configure \
     --disable-system-kerberos \
     --disable-system-pcsc \
     --disable-system-sctp \
+    --disable-compile-against-syscalls \
     --with-cacerts-file="$CWD/cacerts" \
 $(
 #  cacerts is taken from this CentOS package:
@@ -139,10 +153,11 @@ fixJdkArchiveChecksum
 
 JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH LOG=trace make
 
-cd $PKG
-mkdir -p usr/lib${LIBDIRSUFFIX}
-cd usr/lib${LIBDIRSUFFIX}
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+cd $PKG/usr/lib${LIBDIRSUFFIX}
 cp -av $BUILD_DIR/icedtea-build/openjdk.build/j2sdk-image/ $PRGNAM
+ln -sf $PRGNAM ${PRGNAM}${DVER}
+ln -sf $PRGNAM/jre/lib/${LIB_ARCH}/server/libjvm.so .
 
 chown -R root.root $PKG
 find -L . \
@@ -153,18 +168,11 @@ find -L . \
 
 mkdir -p $PKG/etc/profile.d
 for file in $(ls "$CWD/profile.d/${PRGNAM}"*) ; do
-  cat $file | sed -e "s#lib/openjdk7#lib${LIBDIRSUFFIX}/openjdk7#" \
+  cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \
     > $PKG/etc/profile.d/$(basename $file)
 done
 chmod 755 $PKG/etc/profile.d/*
 
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf $PRGNAM ${PRGNAM}${DVER}
-)
-
-cd $PKG/usr/lib${LIBDIRSUFFIX}
-    ln -sf ./$PRGNAM/jre/lib/${LIB_ARCH}/server/libjvm.so .
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/development/openjdk7/openjdk7.info b/development/openjdk7/openjdk7.info
index 70b49e855d..1f40953777 100644
--- a/development/openjdk7/openjdk7.info
+++ b/development/openjdk7/openjdk7.info
@@ -1,24 +1,24 @@
 PRGNAM="openjdk7"
-VERSION="7u271"
-HOMEPAGE="http://openjdk.java.net"
-DOWNLOAD="http://icedtea.classpath.org/download/source/icedtea-2.6.23.tar.xz \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/openjdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/corba.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxp.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jaxws.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/jdk.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/langtools.tar.bz2 \
-          http://icedtea.classpath.org/download/drops/icedtea7/2.6.23/hotspot.tar.bz2"
-MD5SUM="b18cc58b81bdd59f91b961b9430952a6 \
-  69969330d95c9ba4f0088b645958ed1c \
-  bb1270b47c365d2a5757868d43fb30e7 \
-  a8e3b94c09a0a873101322bcf2723507 \
-  9c50dc5e69395dccda60a549c2fac06f \
-  cf1fe157b63e83dc5b8e6f7b134dd5a6 \
-  43166317dfb730ee074d7c42d0181649 \
-  4d77e2dfa55e15eb5602b53ba8ab49ff"
+VERSION="7u321"
+HOMEPAGE="https://openjdk.java.net"
+DOWNLOAD="https://icedtea.classpath.org/download/source/icedtea-2.6.28.tar.xz \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/openjdk.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/corba.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/jaxp.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/jaxws.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/jdk.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/langtools.tar.bz2 \
+          https://icedtea.classpath.org/download/drops/icedtea7/2.6.28/hotspot.tar.bz2"
+MD5SUM="11663b88a06f3461607c026510dd733a \
+        bcd48aa756a108cb437f07ed291436f9 \
+        5c16e53e461cf640842cec44f9a6264a \
+        9fe804632cfd4a47423a58a0171bc420 \
+        01120ce5103a1f1f8b79ad4f8ae1511d \
+        c4332b8442e438ac498f206c8851f68c \
+        ebbc311a2aa8afdf1dd4e3d2b7f55aba \
+        c168159cc98db90a5d14b077e2c49ae9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant"
-MAINTAINER="Strahil Yordanov"
-EMAIL="strahilski@yahoo.com"
+REQUIRES="apache-ant gcc5"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"