summaryrefslogtreecommitdiffstats
path: root/development/avarice/avarice.SlackBuild
diff options
context:
space:
mode:
author Andrew Clemons <andrew.clemons@gmail.com>2021-05-03 20:15:34 +1200
committer Robby Workman <rworkman@slackbuilds.org>2021-05-04 19:28:53 -0500
commita3b9cd8bacd0edd9943696471441e1839fb5269a (patch)
tree16756f037dac1d5a38a02d64199d2734a6b4499a /development/avarice/avarice.SlackBuild
parent1d77064bde66aafb657e116521318e1c37bf57fd (diff)
downloadslackbuilds-a3b9cd8bacd0edd9943696471441e1839fb5269a.tar.gz
slackbuilds-a3b9cd8bacd0edd9943696471441e1839fb5269a.tar.xz
development/avarice: Updated for version 2.14.
This fixes building on -current. Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Diffstat (limited to 'development/avarice/avarice.SlackBuild')
-rw-r--r--development/avarice/avarice.SlackBuild14
1 files changed, 6 insertions, 8 deletions
diff --git a/development/avarice/avarice.SlackBuild b/development/avarice/avarice.SlackBuild
index 3346fc77cc..30746c7409 100644
--- a/development/avarice/avarice.SlackBuild
+++ b/development/avarice/avarice.SlackBuild
@@ -4,13 +4,13 @@
# Written by thorsten
PRGNAM=avarice
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -21,8 +21,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -43,6 +43,8 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
+# thanks alpine linux maintainers
+zcat $CWD/drop_keyword_unused.patch.gz | patch -p1
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -50,10 +52,6 @@ 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 {} \;
-# Fix for gcc-5.2.0 (-current)
-# http://anonscm.debian.org/cgit/collab-maint/avarice.git/plain/debian/patches/bug-777789-gcc-5.patch?id=f8686dbd02cc6710e36f31ab118a46ed0adc758c
-patch -p1 < $CWD/bug-777789-gcc-5.patch
-
rm -rf $TMP/$PRGNAM-build-$VERSION
mkdir $TMP/$PRGNAM-build-$VERSION
cd $TMP/$PRGNAM-build-$VERSION