diff options
Diffstat (limited to 'development/zulu-openjdk7/zulu-openjdk7.SlackBuild')
| -rw-r--r-- | development/zulu-openjdk7/zulu-openjdk7.SlackBuild | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/development/zulu-openjdk7/zulu-openjdk7.SlackBuild b/development/zulu-openjdk7/zulu-openjdk7.SlackBuild index 52b9715514..d61f156c88 100644 --- a/development/zulu-openjdk7/zulu-openjdk7.SlackBuild +++ b/development/zulu-openjdk7/zulu-openjdk7.SlackBuild @@ -25,26 +25,19 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=zulu-openjdk7 -VERSION=${VERSION:-7.0.242} -ZULUVERSION=${ZULUVERSION:-7.34.0.5} +VERSION=${VERSION:-7.0.322} +ZULUVERSION=${ZULUVERSION:-7.50.0.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -# The name of azul's zulu openjdk source archive has the syntax below : -# -# zulu<ZULU_VERSION>-jdk<JDK_VERSION>-linux_x64 -# -# Note: The archive's name is also the name of the top directory found -# in this archive. -# -SRCNAM="zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_x64" - -ARCH=${ARCH:-$(uname -m)} +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i686 ;; + x86_64) ARCH=x64 ;; + 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 @@ -54,7 +47,10 @@ TMP=${TMP:-/tmp/SBo} PKG=${TMP}/package-${PRGNAM} OUTPUT=${OUTPUT:-/tmp} -if [ "${ARCH}" = "x86_64" ] ; then +if [ "$ARCH" = "i686" ]; then + LIB_ARCH=i686 + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x64" ]; then LIB_ARCH=amd64 LIBDIRSUFFIX="64" else @@ -62,6 +58,8 @@ else exit 1 fi +SRCNAM=zulu${ZULUVERSION}-ca-jdk${VERSION}-linux_$ARCH + set -e rm -rf $PKG |