4 files changed, 53 insertions, 25 deletions
diff --git a/development/zulu-openjdk11/zulu-openjdk11.SlackBuild b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
index 94290a8b64..c0dbd27f22 100644
--- a/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
+++ b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for zulu-openjdk11
 
 # Copyright (c) 2018, Sébastien Ballet <slacker6896 at gmail.com>
+# Copyright (c) 2022-2024, Andrew Clemons, Tokyo Japan
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,7 +12,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -25,8 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=zulu-openjdk11
-VERSION=${VERSION:-11.0.14.1}
-ZULUVERSION=${ZULUVERSION:-11.54.25}
+VERSION=${VERSION:-11.0.24}
+ZULUVERSION=${ZULUVERSION:-11.74.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -54,6 +55,12 @@ if [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   ZULU_ARCH=x64
   LIBDIRSUFFIX="64"
+elif  [ "$ARCH" = "arm" ]; then
+  ZULU_ARCH=aarch32hf
+  LIBDIRSUFFIX=""
+elif  [ "$ARCH" = "aarch64" ]; then
+  ZULU_ARCH=aarch64
+  LIBDIRSUFFIX="64"
 else
   echo "Architecture ${ARCH} is not supported."
   exit 1
@@ -66,8 +73,8 @@ set -e
 rm -rf ${PKG}
 mkdir -p ${TMP} ${PKG} ${OUTPUT}
 
-mkdir -p ${PKG}/usr/lib64/
-cd ${PKG}/usr/lib64/
+mkdir -p ${PKG}/usr/lib$LIBDIRSUFFIX/
+cd ${PKG}/usr/lib$LIBDIRSUFFIX/
 tar xvf ${CWD}/${SRCNAM}.tar.gz
 mv ${SRCNAM} ${PRGNAM}
 
@@ -78,9 +85,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+if [ "$ARCH" = "aarch64" ] ; then
+  find $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/bin -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+    | cut -f 1 -d : | xargs patchelf --set-interpreter /lib64/ld-linux-aarch64.so.1 2> /dev/null || true
+fi
+
+find $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null || true
+
 mkdir -p ${PKG}/etc/profile.d
 for SCRIPT in ${PRGNAM}.sh ${PRGNAM}.csh ; do
-  cat ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
+  sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
   chmod 755 ${PKG}/etc/profile.d/${SCRIPT}
 done
 
@@ -88,10 +102,10 @@ mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 
 # move folder demo/ in documentation directory
 #
-mv ${PKG}/usr/lib64/${PRGNAM}/demo ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+mv ${PKG}/usr/lib$LIBDIRSUFFIX/${PRGNAM}/demo ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 
 for CFILE in DISCLAIMER Welcome.html readme.txt ; do
-  mv ${PKG}/usr/lib64/${PRGNAM}/${CFILE} ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+  mv ${PKG}/usr/lib$LIBDIRSUFFIX/${PRGNAM}/${CFILE} ${PKG}/usr/doc/${PRGNAM}-${VERSION}
 done
 
 cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.SlackBuild
@@ -99,5 +113,5 @@ cat ${CWD}/${PRGNAM}.SlackBuild > ${PKG}/usr/doc/${PRGNAM}-${VERSION}/${PRGNAM}.
 mkdir -p ${PKG}/install
 cat ${CWD}/slack-desc > ${PKG}/install/slack-desc
 
-cd ${PKG}
-/sbin/makepkg -l y -c n ${OUTPUT}/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.$PKGTYPE
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/zulu-openjdk11/zulu-openjdk11.csh b/development/zulu-openjdk11/zulu-openjdk11.csh
index a8bab21b57..75fe5e4b30 100644
--- a/development/zulu-openjdk11/zulu-openjdk11.csh
+++ b/development/zulu-openjdk11/zulu-openjdk11.csh
@@ -1,5 +1,10 @@
 #!/bin/csh
-setenv JAVA_HOME /usr/lib64/zulu-openjdk11
-setenv MANPATH ${MANPATH}:${JAVA_HOME}/man
-setenv PATH ${PATH}:${JAVA_HOME}/bin
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server
+setenv JAVA_HOME /usr/lib%LIBDIRSUFFIX%/zulu-openjdk11
+setenv MANPATH ${JAVA_HOME}/man:${MANPATH}
+setenv PATH ${JAVA_HOME}/bin:${PATH}
+
+if ($?LD_LIBRARY_PATH == 1) then
+  setenv LD_LIBRARY_PATH ${JAVA_HOME}/lib/server:${LD_LIBRARY_PATH}
+else
+  setenv LD_LIBRARY_PATH ${JAVA_HOME}/lib/server
+endif
diff --git a/development/zulu-openjdk11/zulu-openjdk11.info b/development/zulu-openjdk11/zulu-openjdk11.info
index 3a8725fd89..76aa9528f2 100644
--- a/development/zulu-openjdk11/zulu-openjdk11.info
+++ b/development/zulu-openjdk11/zulu-openjdk11.info
@@ -1,10 +1,14 @@
 PRGNAM="zulu-openjdk11"
-VERSION="11.0.14.1"
+VERSION="11.0.24"
 HOMEPAGE="https://www.azul.com/downloads/"
-DOWNLOAD="https://cdn.azul.com/zulu/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_i686.tar.gz"
-MD5SUM="cfc3dfaf76e82e21549b3008bffafecc"
-DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_x64.tar.gz"
-MD5SUM_x86_64="e53fb58937cceb690ca1d810dbda49d1"
+DOWNLOAD="https://cdn.azul.com/zulu-embedded/bin/zulu11.74.15-ca-jdk11.0.24-linux_aarch32hf.tar.gz \
+          https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_i686.tar.gz"
+MD5SUM="a14b048753ba04b9a07dd078480ce003 \
+        53e2e2377bfa31ad4d29c0c26dfec984"
+DOWNLOAD_x86_64="https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz \
+                 https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_aarch64.tar.gz"
+MD5SUM_x86_64="01096b7970954d03d3698326d7b11b8c \
+               61ae67a6a8ea9c906c3b503b0e72af7d"
 REQUIRES=""
-MAINTAINER="Sébastien Ballet"
-EMAIL="slacker6896@gmail.com"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"
diff --git a/development/zulu-openjdk11/zulu-openjdk11.sh b/development/zulu-openjdk11/zulu-openjdk11.sh
index 8b05a565fc..6f59bbfdf9 100644
--- a/development/zulu-openjdk11/zulu-openjdk11.sh
+++ b/development/zulu-openjdk11/zulu-openjdk11.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
-export JAVA_HOME=/usr/lib64/zulu-openjdk11
-export MANPATH="${MANPATH}:${JAVA_HOME}/man"
-export PATH="${PATH}:${JAVA_HOME}/bin"
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${JAVA_HOME}/lib/server"
+export JAVA_HOME=/usr/lib%LIBDIRSUFFIX%/zulu-openjdk11
+export MANPATH="${JAVA_HOME}/man:${MANPATH}"
+export PATH="${JAVA_HOME}/bin:${PATH}"
+
+if [ -z "$LD_LIBRARY_PATH" ]; then
+  export LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
+else
+  export LD_LIBRARY_PATH="${JAVA_HOME}/lib/server:${LD_LIBRARY_PATH}"
+fi