summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Andrew Clemons2023-04-09 05:36:03 +0200
committer Willy Sudiarto Raharjo2023-04-15 02:15:32 +0200
commitf7faf8bc9f41d25b2443415506e9599fe9e5fce5 (patch)
tree5fe3b80aead78a9749ee1bbf6226e64bdc4205df
parent09936e1a3d3c6a4b921a08443583fe2577050e34 (diff)
downloadslackbuilds-f7faf8bc9f41d25b2443415506e9599fe9e5fce5.tar.gz
development/zulu-openjdk11: Fix build for -current.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/zulu-openjdk11/zulu-openjdk11.SlackBuild11
1 files changed, 8 insertions, 3 deletions
diff --git a/development/zulu-openjdk11/zulu-openjdk11.SlackBuild b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
index c7d8db2f13..fa9cf17bd7 100644
--- a/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
+++ b/development/zulu-openjdk11/zulu-openjdk11.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zulu-openjdk11
VERSION=${VERSION:-11.0.18}
ZULUVERSION=${ZULUVERSION:-11.62.17}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -85,6 +85,11 @@ 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
+
mkdir -p ${PKG}/etc/profile.d
for SCRIPT in ${PRGNAM}.sh ${PRGNAM}.csh ; do
sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g ${CWD}/${SCRIPT} > ${PKG}/etc/profile.d/${SCRIPT}
@@ -106,5 +111,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