diff --git a/system/mergerfs/mergerfs.SlackBuild b/system/mergerfs/mergerfs.SlackBuild index 82d48b3ec2..d25be79163 100644 --- a/system/mergerfs/mergerfs.SlackBuild +++ b/system/mergerfs/mergerfs.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=mergerfs -VERSION=${VERSION:-2.33.5} +VERSION=${VERSION:-2.40.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,21 +47,13 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" +if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -77,15 +69,16 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; make \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ PREFIX="/usr" \ + LIBDIR="/usr/lib$LIBDIRSUFFIX" \ MANDIR="/usr/man" \ DOCDIR="/usr/doc/$PRGNAM-$VERSION" \ BUILD="$ARCH-slackware-linux" \ DESTDIR=$PKG \ install +chmod a+x $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM/*.so + 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 diff --git a/system/mergerfs/mergerfs.info b/system/mergerfs/mergerfs.info index c7af623bd7..9ee4092cc1 100644 --- a/system/mergerfs/mergerfs.info +++ b/system/mergerfs/mergerfs.info @@ -1,8 +1,8 @@ PRGNAM="mergerfs" -VERSION="2.33.5" +VERSION="2.40.2" HOMEPAGE="https://github.com/trapexit/mergerfs" -DOWNLOAD="https://github.com/trapexit/mergerfs/releases/download/2.33.5/mergerfs-2.33.5.tar.gz" -MD5SUM="29d389f68d1f4b6300f15db67df817eb" +DOWNLOAD="https://github.com/trapexit/mergerfs/releases/download/2.40.2/mergerfs-2.40.2.tar.gz" +MD5SUM="1f3cfb7fcde4f885ec2082b0ba768100" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""