From 1a8d2bef3954da1cf1bc8aa12c409ab8a8a86952 Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Mon, 24 Oct 2022 18:34:18 +0900 Subject: development/zulu-openjdk6: Fix symlinks, new maint. Signed-off-by: Andrew Clemons Signed-off-by: Willy Sudiarto Raharjo --- development/zulu-openjdk6/zulu-openjdk6.SlackBuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'development/zulu-openjdk6/zulu-openjdk6.SlackBuild') diff --git a/development/zulu-openjdk6/zulu-openjdk6.SlackBuild b/development/zulu-openjdk6/zulu-openjdk6.SlackBuild index d514c53f2e06..668f79d7158b 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 -- cgit v1.2.3