diff --git a/network/open-isns/doinst.sh b/network/open-isns/doinst.sh index ffe6583a67..d427c452bc 100644 --- a/network/open-isns/doinst.sh +++ b/network/open-isns/doinst.sh @@ -1,4 +1,3 @@ -# 20230620 bkw: Please stick with the config() from our template. config() { NEW="$1" diff --git a/network/open-isns/open-isns.SlackBuild b/network/open-isns/open-isns.SlackBuild index 93207785d0..c3d778cf4e 100644 --- a/network/open-isns/open-isns.SlackBuild +++ b/network/open-isns/open-isns.SlackBuild @@ -2,8 +2,7 @@ # Slackware build script for open-isns -# Copyright 2019 Wayne Cuddy USA -# Copyright 2021 Mario Preksavec, Zagreb, Croatia +# Copyright 2024 Wayne Cuddy USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=open-isns -VERSION=${VERSION:-0.101} +VERSION=${VERSION:-0.102} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -77,24 +79,22 @@ 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 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG -make install_hdrs DESTDIR=$PKG -make install_lib DESTDIR=$PKG - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mkdir build +cd build + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + meson .. \ + --buildtype=release \ + --infodir=/usr/info \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ + --mandir=/usr/man \ + --prefix=/usr \ + --sysconfdir=/etc \ + -Dstrip=true + "${NINJA:=ninja}" + DESTDIR=$PKG $NINJA install +cd .. find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/network/open-isns/open-isns.info b/network/open-isns/open-isns.info index 36f15a044e..b62c1c090d 100644 --- a/network/open-isns/open-isns.info +++ b/network/open-isns/open-isns.info @@ -1,8 +1,8 @@ PRGNAM="open-isns" -VERSION="0.101" +VERSION="0.102" HOMEPAGE="https://github.com/open-iscsi/open-isns" -DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.101/open-isns-0.101.tar.gz" -MD5SUM="bd017a07d685b9c87e0da29fc3f899a2" +DOWNLOAD="https://github.com/open-iscsi/open-isns/archive/v0.102/open-isns-0.102.tar.gz" +MD5SUM="914f7654ff7398dd4dcf69885f2fc691" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""