diff options
Diffstat (limited to 'libraries/argon2/argon2.SlackBuild')
-rw-r--r-- | libraries/argon2/argon2.SlackBuild | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libraries/argon2/argon2.SlackBuild b/libraries/argon2/argon2.SlackBuild index a72688156e81..3f40797c3655 100644 --- a/libraries/argon2/argon2.SlackBuild +++ b/libraries/argon2/argon2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for argon2 -# Copyright 2017 Mario Preksavec, Zagreb, Croatia +# Copyright 2017, 2020 Mario Preksavec, Zagreb, Croatia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=argon2 -VERSION=${VERSION:-20170329_1eea010} SRCNAM=phc-winner-argon2 -COMMIT=${COMMIT:-1eea0104e7cb2a38c617cf90ffa46ce5db6aceda} +VERSION=${VERSION:-20190702} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,9 +56,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-COMMIT -tar xvf $CWD/$SRCNAM-$COMMIT.tar.gz -cd $SRCNAM-$COMMIT +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -67,10 +66,10 @@ 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 {} \; -sed -e "s|@@LIBDIRSUFFIX@@|$LIBDIRSUFFIX|" \ - -e "s|@@VERSION@@|$VERSION|" $CWD/patches/pkgconfig.diff | patch -p1 - -sed -e "s|@@LIBDIRSUFFIX@@|$LIBDIRSUFFIX|" $CWD/patches/Makefile.diff | patch -p1 +# Fix build options and library path: +sed -i "s/CFLAGS += -std=c89 -O3 -Wall -g -Iinclude -Isrc/CFLAGS += -std=c89 -Iinclude -Isrc/g" Makefile +sed -i "s/LIBRARY_REL ?= lib.*/LIBRARY_REL = lib${LIBDIRSUFFIX}/g" Makefile +sed -i "s/CFLAGS += -march=\$(OPTTARGET)/CFLAGS += ${SLKCFLAGS}/g" Makefile make libs DESTDIR=$PKG make install DESTDIR=$PKG @@ -85,7 +84,7 @@ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a LICENSE README.md argon2-specs.pdf $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG.md LICENSE README.md argon2-specs.pdf $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |