From f36115f9fe863deb3d62ce48c1ac6ac4dc2e0198 Mon Sep 17 00:00:00 2001
From: Kyle Guinn
Date: Tue, 11 May 2010 22:22:45 +0200
Subject: development/sdcc: Updated for version 2.8.0

---
 development/sdcc/README          |  3 +++
 development/sdcc/sdcc.SlackBuild | 56 +++++++++++++++++++++-------------------
 development/sdcc/sdcc.info       |  6 ++---
 3 files changed, 36 insertions(+), 29 deletions(-)

(limited to 'development')

diff --git a/development/sdcc/README b/development/sdcc/README
index e6d1bb7e9d..05fe4ba96a 100644
--- a/development/sdcc/README
+++ b/development/sdcc/README
@@ -1,3 +1,6 @@
 SDCC is a retargettable, optimizing ANSI C compiler that targets the Intel
 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08 based MCUs.  Work is in
 progress on supporting the Microchip PIC16 and PIC18 series.
+
+This requires gc (well, it's actually optional, but the build script enables
+it by default - if that's not what you want, then remove "--enable-libgc")
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index f4ca887830..8e63c726cb 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -3,54 +3,58 @@
 # Slackware build script for sdcc
 # Written by Kyle Guinn <elyk03@gmail.com>
 
-set -e
+PRGNAM="sdcc"
+VERSION=${VERSION:-"2.8.0"}
+ARCH=${ARCH:-"i486"}
+BUILD=${BUILD:-"1"}
+TAG=${TAG:-"_SBo"}
 
-PRGNAM=sdcc
-VERSION=2.7.0
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+TMP=${TMP:-"/tmp/SBo"}
+PKG="$TMP/package-$PRGNAM-$VERSION"
+OUTPUT=${OUTPUT:-"/tmp"}
+
+DOCS="COPYING ChangeLog"
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+	SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM
-tar -xjvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
 cd $PRGNAM
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+chmod -R u+w,go+r-w,a-st .
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --infodir=/usr/info \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION
-#  --enable-doc   # (requires lyx, untested)
-#  --enable-libgc # (requires libgc, untested)
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--infodir=/usr/info \
+	--mandir=/usr/man \
+	--docdir=/usr/doc/$PRGNAM-$VERSION \
+	--build=$ARCH-slackware-linux \
+	--enable-libgc
+	#--enable-doc  # (requires lyx, untested)
 
 make
 make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+	| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index fc97632f87..15f64df1c9 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,8 +1,8 @@
 PRGNAM="sdcc"
-VERSION="2.7.0"
+VERSION="2.8.0"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sdcc/sdcc-src-2.7.0.tar.bz2"
-MD5SUM="0195813a0e13752a079b9e689674f98f"
+DOWNLOAD="http://downloads.sourceforge.net/sdcc/sdcc-src-2.8.0.tar.bz2"
+MD5SUM="1b9c2e581b92d5e3f13bca37c5784080"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3