diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-03-01 21:46:49 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-03 15:56:50 +0700 |
| commit | 02c1c6d59a757037f8108608c02efecea72921c7 (patch) | |
| tree | 6e1e7b7306e5e94bd9b83131816117b98cf3fd02 /development | |
| parent | c2259764b18d781e4397e6f6518af5da802e2949 (diff) | |
development/zulu-openjdk6: Fix pkg ARCH.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development')
| -rw-r--r-- | development/zulu-openjdk6/zulu-openjdk6.SlackBuild | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/development/zulu-openjdk6/zulu-openjdk6.SlackBuild b/development/zulu-openjdk6/zulu-openjdk6.SlackBuild index a4c4e00f30934..d514c53f2e06a 100644 --- a/development/zulu-openjdk6/zulu-openjdk6.SlackBuild +++ b/development/zulu-openjdk6/zulu-openjdk6.SlackBuild @@ -31,12 +31,13 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -ARCH=${ARCH:-$(uname -m)} - -case "${ARCH}" in - i?86) ARCH=i686 ;; - x86_64) ARCH=x64 ;; -esac +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" @@ -48,17 +49,17 @@ PKG=${TMP}/package-${PRGNAM} OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i686" ]; then - LIB_ARCH=i686 + ZULU_ARCH=i686 LIBDIRSUFFIX="" -elif [ "$ARCH" = "x64" ]; then - LIB_ARCH=amd64 +elif [ "$ARCH" = "x86_64" ]; then + ZULU_ARCH=x64 LIBDIRSUFFIX="64" else echo "Architecture ${ARCH} is not supported." exit 1 fi -SRCNAM=zulu${ZULUVERSION}-jdk${VERSION}-linux_$ARCH +SRCNAM=zulu${ZULUVERSION}-jdk${VERSION}-linux_$ZULU_ARCH set -e |