diff options
| -rw-r--r-- | development/openjdk8/README | 1 | ||||
| -rw-r--r-- | development/openjdk8/openjdk8.SlackBuild | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/development/openjdk8/README b/development/openjdk8/README index 2a35a9bbd8a6..35f166374b3f 100644 --- a/development/openjdk8/README +++ b/development/openjdk8/README @@ -9,6 +9,7 @@ dependency package -- you may wish to remove it after you're done.) If you already have 'openjdk8' on your system (and are compiling a newer version, for example) you don't need the 'openjdk7' dependency. +Also, you can use 'zulu-openjdk7' instead of 'openjdk7' if you wish. 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. diff --git a/development/openjdk8/openjdk8.SlackBuild b/development/openjdk8/openjdk8.SlackBuild index 85ea3cf2c0ef..888533023644 100644 --- a/development/openjdk8/openjdk8.SlackBuild +++ b/development/openjdk8/openjdk8.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for OpenJDK -# Copyright 2020 Strahil Yordanov, Sofia, Bulgaria +# Copyright 2022 Strahil Yordanov, Sofia, Bulgaria # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=openjdk8 VERSION=${VERSION:-8u345} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -60,7 +60,8 @@ else fi BOOT_JAVA=/usr/lib${LIBDIRSUFFIX}/openjdk7 -[ ! -d ${BOOT_JAVA} ] && BOOT_JAVA=${BOOT_JAVA%?}8 +[ ! -d ${BOOT_JAVA} ] && BOOT_JAVA=${BOOT_JAVA%/*}/zulu-openjdk7 +[ ! -d ${BOOT_JAVA} ] && BOOT_JAVA=${BOOT_JAVA%/*}/openjdk8 [ ! -d ${BOOT_JAVA} ] && { echo "Boot java not found"; exit 1; } set -e |