diff --git a/development/zulu-openjdk6/zulu-openjdk6.SlackBuild b/development/zulu-openjdk6/zulu-openjdk6.SlackBuild index d514c53f2e..668f79d715 100644 --- a/development/zulu-openjdk6/zulu-openjdk6.SlackBuild +++ b/development/zulu-openjdk6/zulu-openjdk6.SlackBuild @@ -1,8 +1,9 @@ #!/bin/bash -# Slackware build script for zulu-openjdk7 +# Slackware build script for zulu-openjdk6 # Copyright (c) 2017-2019, Sébastien Ballet +# Copyright (c) 2022, Andrew Clemons, Tokyo Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zulu-openjdk6 VERSION=${VERSION:-6.0.119} ZULUVERSION=${ZULUVERSION:-6.22.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -48,12 +49,10 @@ TMP=${TMP:-/tmp/SBo} PKG=${TMP}/package-${PRGNAM} OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i686" ]; then - ZULU_ARCH=i686 - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then +if [ "$ARCH" = "x86_64" ]; then ZULU_ARCH=x64 LIBDIRSUFFIX="64" + JVMLIBARCH="amd64" else echo "Architecture ${ARCH} is not supported." exit 1 @@ -84,9 +83,10 @@ find -L . \ # or "no". Default to "yes" # if [ "${CREATE_LIBJVM_SYMLINK:-yes}" = "yes" ] ; then - ln -sf \ - ${PRGNAM}/jre/lib/${LIB_ARCH}/server/libjvm.so \ - $PKG/usr/lib${LIBDIRSUFFIX}/libjvm.so + ( + cd $PKG/usr/lib${LIBDIRSUFFIX}/ + ln -sf $PRGNAM/jre/lib/${JVMLIBARCH}/server/libjvm.so + ) fi mkdir -p ${PKG}/etc/profile.d diff --git a/development/zulu-openjdk6/zulu-openjdk6.info b/development/zulu-openjdk6/zulu-openjdk6.info index c236f75c0f..61a7892ea2 100644 --- a/development/zulu-openjdk6/zulu-openjdk6.info +++ b/development/zulu-openjdk6/zulu-openjdk6.info @@ -6,5 +6,5 @@ MD5SUM="" DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu6.22.0.3-jdk6.0.119-linux_x64.tar.gz" MD5SUM_x86_64="bb8bd2d476e21c60b59fbecee43667ce" REQUIRES="" -MAINTAINER="Sébastien Ballet" -EMAIL="slacker6896@gmail.com" +MAINTAINER="Andrew Clemons" +EMAIL="andrew.clemons@gmail.com"