diff options
Diffstat (limited to 'development/openjdk7/openjdk7.SlackBuild')
| -rw-r--r-- | development/openjdk7/openjdk7.SlackBuild | 114 |
1 files changed, 62 insertions, 52 deletions
diff --git a/development/openjdk7/openjdk7.SlackBuild b/development/openjdk7/openjdk7.SlackBuild index c5046bc536..202502482c 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 @@ -22,58 +23,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -function createPatchedJdkArchive() { - - mkdir -p ${SBO_PATCH_DIR} && cd ${SBO_PATCH_DIR} - tar xvf "${CWD}/jdk.tar.bz2" - cd jdk-* - - cat << EOF | patch -d ./src/share/classes/sun/security/util Optional.java -diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:57:14.258731932 +0300 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:59:48.600721516 +0300 -@@ -193,7 +193,7 @@ - if (!isPresent()) - return empty(); - else { -- return Optional.ofNullable(mapper.apply(value)); -+ return (Optional<U>) Optional.ofNullable(mapper.apply(value)); - } - } - -EOF - - cd .. - tar -cvjSf jdk.tar.bz2 jdk-* -} - -function fixJdkArchiveChecksum() { - local newChecksum=$(sha256sum "${SBO_PATCH_DIR}/jdk.tar.bz2" | awk '{print $1}') - - sed -r -i "s/^(\s*JDK_SHA256SUM\s*=\s*).*$/\1${newChecksum}/" Makefile -} - cd $(dirname $0) ; CWD=$(pwd) - PRGNAM=openjdk7 -VERSION=${VERSION:-7u271} -BUILD=${BUILD:-1} +VERSION=${VERSION:-7u321} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} DVER=1.7.0_$(printf $VERSION | cut -du -f2) -ICEDTEA=icedtea-2.6.23 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 fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -85,6 +50,11 @@ SBO_PATCH_DIR="${BUILD_DIR}/jdk-archive-patch" PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +. $CWD/$PRGNAM.info || exit 1 +ICEDTEA=`echo $DOWNLOAD | awk '{print $1}' | awk -F / '{print $NF}'` +ANT=`echo $DOWNLOAD | awk '{print $9}' | awk -F / '{print $NF}'` +ANT_HOME=$BUILD_DIR/${ANT%-bin*} # this overrides the "official" ANT_HOME + if [ "$ARCH" = "x86_64" ]; then LIB_ARCH=amd64 LIBDIRSUFFIX="64" @@ -93,8 +63,51 @@ 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 +function createPatchedJdkArchive() { + + mkdir -p ${SBO_PATCH_DIR} && cd ${SBO_PATCH_DIR} + tar xvf "${CWD}/jdk.tar.bz2" + cd jdk-* + + cat << EOF | patch -d ./src/share/classes/sun/security/util Optional.java +diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:57:14.258731932 +0300 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/Optional.java 2019-10-20 11:59:48.600721516 +0300 +@@ -193,7 +193,7 @@ + if (!isPresent()) + return empty(); + else { +- return Optional.ofNullable(mapper.apply(value)); ++ return (Optional<U>) Optional.ofNullable(mapper.apply(value)); + } + } + +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-* +} + +function fixJdkArchiveChecksum() { + local newChecksum=$(sha256sum "${SBO_PATCH_DIR}/jdk.tar.bz2" | awk '{print $1}') + + sed -r -i "s/^(\s*JDK_SHA256SUM\s*=\s*).*$/\1${newChecksum}/" Makefile +} + set -e rm -rf $BUILD_DIR $PKG @@ -104,13 +117,14 @@ mkdir -p $TMP $BUILD_DIR $PKG $OUTPUT cd $BUILD_DIR -tar -xvf $CWD/${ICEDTEA}.tar.xz +tar -xvf $CWD/${ANT} +tar -xvf $CWD/${ICEDTEA} mkdir icedtea-build cd icedtea-build # Set JAVA_HOME in order to avoid conflicts with other already installed JVMs. -JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH ../$ICEDTEA/configure \ +JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$ANT_HOME/bin:$PATH ../${ICEDTEA%.tar*}/configure \ --disable-docs \ --disable-downloading \ --with-jdk-home=${BOOT_JAVA} \ @@ -118,6 +132,8 @@ JAVA_HOME=${BOOT_JAVA} PATH=${BOOT_JAVA}/bin:$PATH ../$ICEDTEA/configure \ --disable-system-kerberos \ --disable-system-pcsc \ --disable-system-sctp \ + --disable-system-zlib \ + --disable-compile-against-syscalls \ --with-cacerts-file="$CWD/cacerts" \ $( # cacerts is taken from this CentOS package: @@ -139,10 +155,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 +170,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/openjdk#lib${LIBDIRSUFFIX}/openjdk#" \ > $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 |