summaryrefslogtreecommitdiffstats
path: root/development/avarice
diff options
context:
space:
mode:
Diffstat (limited to 'development/avarice')
-rw-r--r--development/avarice/README2
-rw-r--r--development/avarice/avarice.SlackBuild30
-rw-r--r--development/avarice/avarice.info6
-rw-r--r--development/avarice/bug-777789-gcc-5.patch23
-rw-r--r--development/avarice/drop_keyword_unused.patch.gzbin0 -> 563 bytes
5 files changed, 23 insertions, 38 deletions
diff --git a/development/avarice/README b/development/avarice/README
index 22e27c6e50..53fda7280b 100644
--- a/development/avarice/README
+++ b/development/avarice/README
@@ -1,2 +1,2 @@
-AVaRICE is a program which interfaces the GNU Debugger GDB with the
+AVaRICE is a program which interfaces the GNU Debugger GDB with the
AVR JTAG ICE available from Atmel.
diff --git a/development/avarice/avarice.SlackBuild b/development/avarice/avarice.SlackBuild
index 3346fc77cc..761ccb9a32 100644
--- a/development/avarice/avarice.SlackBuild
+++ b/development/avarice/avarice.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for avarice
# Written by thorsten
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=avarice
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.14}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
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 +53,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 +62,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
@@ -89,4 +97,4 @@ 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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/avarice/avarice.info b/development/avarice/avarice.info
index 1ad7ba7bd3..09cab6e04e 100644
--- a/development/avarice/avarice.info
+++ b/development/avarice/avarice.info
@@ -1,8 +1,8 @@
PRGNAM="avarice"
-VERSION="2.13"
+VERSION="2.14"
HOMEPAGE="http://avarice.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/avarice/files/avarice/avarice-2.13/avarice-2.13.tar.bz2"
-MD5SUM="b9ea1202cfe78b6b008192f092b2dd6c"
+DOWNLOAD="https://sourceforge.net/projects/avarice/files/avarice/avarice-2.14/avarice-2.14.tar.bz2"
+MD5SUM="393f5f607a42a6ac9b47b5e963a66584"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="avr-gdb"
diff --git a/development/avarice/bug-777789-gcc-5.patch b/development/avarice/bug-777789-gcc-5.patch
deleted file mode 100644
index a4e385e3f9..0000000000
--- a/development/avarice/bug-777789-gcc-5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix FTBFS for GCC 5
-Author: Tobias Frost <tobi@debian.org>
-Bug: https://sourceforge.net/p/avarice/patches/34/
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777789
-Last-Update: 2015-05-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/pragma.h
-+++ b/src/pragma.h
-@@ -28,9 +28,10 @@
- */
- #if defined(__GNUC__)
- # if __GNUC__ > 4
--# define PRAGMA_DIAG_PUSH _Pragma(GCC diagnostic push)
--# define PRAGMA_DIAG_POP _Pragma(GCC diagnostic pop)
--# define PRAGMA_DIAG_IGNORED(x) _Pragma(GCC diagnostic ignored x)
-+# define PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push")
-+# define PRAGMA_DIAG_POP _Pragma("GCC diagnostic pop")
-+# define PRAGMA_(x) _Pragma(#x)
-+# define PRAGMA_DIAG_IGNORED(x) PRAGMA_(GCC diagnostic ignored x)
- # elif __GNUC__ == 4
- # if __GNUC_MINOR__ >= 6
- # define PRAGMA_DIAG_PUSH _Pragma("GCC diagnostic push")
diff --git a/development/avarice/drop_keyword_unused.patch.gz b/development/avarice/drop_keyword_unused.patch.gz
new file mode 100644
index 0000000000..d23aa38ada
--- /dev/null
+++ b/development/avarice/drop_keyword_unused.patch.gz
Binary files differ