aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Clemons <andrew.clemons@gmail.com>2023-04-09 12:36:03 +0900
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-04-15 07:15:32 +0700
commit9634f2a876f188f5e1868e46229edab7dd79fb7f (patch)
treefa3cc20db0f8c3dea5cec73e1c300635d98e792c
parentf7faf8bc9f41d25b2443415506e9599fe9e5fce5 (diff)
development/zulu-openjdk17: 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-openjdk17/zulu-openjdk17.SlackBuild11
1 files changed, 8 insertions, 3 deletions
diff --git a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
index 661abc02ad76..1e43c2d06053 100644
--- a/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
+++ b/development/zulu-openjdk17/zulu-openjdk17.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=zulu-openjdk17
VERSION=${VERSION:-17.0.6}
ZULUVERSION=${ZULUVERSION:-17.40.19}
-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