2 files changed, 26 insertions, 13 deletions
diff --git a/development/avr-gdb/avr-gdb.SlackBuild b/development/avr-gdb/avr-gdb.SlackBuild
index 92d5be38b9..0197b6eca9 100644
--- a/development/avr-gdb/avr-gdb.SlackBuild
+++ b/development/avr-gdb/avr-gdb.SlackBuild
@@ -1,29 +1,39 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for avr-gdb
 
 # Written by thorsten
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=avr-gdb
-VERSION=${VERSION:-7.8.1}
+VERSION=${VERSION:-10.1}
 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"
@@ -64,7 +74,9 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
   --target=avr \
   --disable-nls \
   --enable-languages=c,c++ \
-  --with-python=/usr/bin/python2 \
+  --with-python=/usr/bin/python3 \
+  --with-guile=guile-2.2 \
+  --with-system-readline \
   --with-system-gdbinit=/etc/gdb/gdbinit \
   --program-prefix="avr-" \
   --program-suffix="" \
@@ -80,7 +92,8 @@ 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
 
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+( cd $PKG/usr/info
+  for i in *; do mv $i avr-$i; gzip -9 avr-$i; done )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 for file in COPYING* ChangeLog MAINTAINERS README*; do
@@ -99,4 +112,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/avr-gdb/avr-gdb.info b/development/avr-gdb/avr-gdb.info
index 18c9d11808..0d517fb683 100644
--- a/development/avr-gdb/avr-gdb.info
+++ b/development/avr-gdb/avr-gdb.info
@@ -1,10 +1,10 @@
 PRGNAM="avr-gdb"
-VERSION="7.8.1"
+VERSION="10.1"
 HOMEPAGE="http://www.gnu.org/software/gdb/"
-DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-7.8.1.tar.xz"
-MD5SUM="8072be87a94be0936bc3b4b6941b0862"
+DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gdb/gdb-10.1.tar.xz"
+MD5SUM="1822a7dd45e7813f4408407eec1a6af1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="avr-gcc"
+REQUIRES="avr-gcc guile2.2"
 MAINTAINER="Thorsten"
 EMAIL="thorsten.johannvorderbrueggen@t-online.de"