1 files changed, 12 insertions, 20 deletions
diff --git a/development/arm-gdb/arm-gdb.SlackBuild b/development/arm-gdb/arm-gdb.SlackBuild
index ebd750408a..51a364471f 100644
--- a/development/arm-gdb/arm-gdb.SlackBuild
+++ b/development/arm-gdb/arm-gdb.SlackBuild
@@ -25,7 +25,7 @@
 # Written by thorsten <thorsten (dot) johannvorderbrueggen (at) t-online (dot) de>
 
 PRGNAM=arm-gdb
-VERSION=${VERSION:-7.8.1}
+VERSION=${VERSION:-8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,42 +81,34 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \
   --localstatedir=/var \
   --infodir=/usr/info \
   --mandir=/usr/man \
-  --target=arm-none-eabi \
+  --build=$ARCH-slackware-linux \
+  --target="arm-none-eabi" \
+  --enable-languages="c,c++" \
+  --enable-interwork \
+  --enable-multilib \
   --disable-nls \
-  --enable-languages=c,c++ \
-  --with-python=/usr/bin/python2 \
-  --with-system-gdbinit=/etc/gdb/gdbinit \
- --enable-interwork \
- --enable-multilib \
-  --program-prefix="arm-none-eabi-" \
-  --program-suffix="" \
-  --build=$ARCH-slackware-linux
+  --with-python=/usr/bin/python \
+  --with-system-gdbinit=/etc/gdb/gdbinit
 
 make
 make install DESTDIR=$PKG
 
+# Remove stuff that would replace files in Slackware's gdb package
+rm -rf $PKG/usr/share/
+rm -rf $PKG/usr/info
+
 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
 
 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*
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 for file in COPYING* ChangeLog MAINTAINERS README*; do
   cp ../gdb-$VERSION/$file $PKG/usr/doc/$PRGNAM-$VERSION
 done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Remove useless stuff
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libiberty.a
-rm -rf $PKG/usr/include/gdb
-rm -rf $PKG/usr/share/gdb
-rm -rf $PKG/usr/share/info
-rm -rf $PKG/usr/share/man
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc