development/sdcc: Updated for version 3.5.0.

Signed-off-by: Kyle Guinn <elyk03@gmail.com>

3 files changed, 34 insertions, 30 deletions

diff --git a/development/sdcc/patches/source-tree.patch b/development/sdcc/patches/source-tree.patch
index dea29a7b87..d5378e706b 100644
--- a/development/sdcc/patches/source-tree.patch
+++ b/development/sdcc/patches/source-tree.patch
@@ -1,11 +1,13 @@
 diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
 --- a/device/lib/Makefile.in
 +++ b/device/lib/Makefile.in
-@@ -521,10 +521,10 @@
+@@ -522,11 +522,11 @@
+ 
  	for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 pic14 pic16; do \
  	  find $(sdcc_libdir)/src/$$src -depth \
- 	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+-	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
++	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.a' -o -name '*.lib' -o \
 +	    -name '*.lst' -o -name '*.asm' -o -name '*.cod' -o -name '*.hex' -o -name '.svn' -o -name 'autom4te.cache' -o \
  	    -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
 -	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
@@ -18,11 +20,13 @@ diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
 diff --git a/device/non-free/lib/Makefile.in b/device/non-free/lib/Makefile.in
 --- a/device/non-free/lib/Makefile.in
 +++ b/device/non-free/lib/Makefile.in
-@@ -354,10 +354,10 @@
- 	for src in pic14 pic16; do \
+@@ -357,11 +357,11 @@
+ 
+ 	for src in $(ENABLED_PORTS); do \
  	  find $(sdcc_libdir)/src/$$src -depth \
- 	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+-	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
 -	    -name '*.lst' -o -name '*.asm' -o -name '.svn' -o -name 'autom4te.cache' -o \
++	    \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.a' -o -name '*.lib' -o \
 +	    -name '*.lst' -o -name '*.asm' -o -name '*.cod' -o -name '*.hex' -o -name '.svn' -o -name 'autom4te.cache' -o \
  	    -name 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
 -	    -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
@@ -31,4 +35,4 @@ diff --git a/device/non-free/lib/Makefile.in b/device/non-free/lib/Makefile.in
 +	    -name 'bootstrap.sh' -o -name '.deps' -o -name '.checkdevices' -o -name '.checksupport' -o -name 'pics.supported' \) \
  	    -exec rm -rf {} + ; \
  	done
- 
+ endif
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index 05fb845662..be9c0bfddc 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -2,36 +2,36 @@
 
 # Slackware build script for sdcc
 
-# Copyright 2014 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2014-2015 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
 # 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+#    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sdcc
-VERSION=${VERSION:-3.4.0}
+VERSION=${VERSION:-3.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
+  case "$(uname -m)" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
+       *) ARCH=$(uname -m) ;;
   esac
 fi
 
@@ -65,11 +65,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-src-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
 
 # A few Makefiles install (copy) the source tree _after_ building, and
 # accidentally install a bunch of build byproducts which they try to clean
@@ -88,6 +84,10 @@ if [ "${ENABLE_PIC:-no}" = 'no' ]; then
   enable_pic='--disable-pic14-port --disable-pic16-port'
 fi
 
+# Unset $ARCH, device/lib/pic*/configure uses it for a different purpose.
+# Also unset $EARCH for good measure.
+ARCH= \
+EARCH= \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -106,7 +106,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -exec 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
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index 270235972e..f002b488f4 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,8 +1,8 @@
 PRGNAM="sdcc"
-VERSION="3.4.0"
+VERSION="3.5.0"
 HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/sdcc/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2"
-MD5SUM="92db2ea2526f6cef412547bb1e759a48"
+DOWNLOAD="http://downloads.sourceforge.net/sdcc/sdcc-src-3.5.0.tar.bz2"
+MD5SUM="e0a1df72747c481cdedbbd328b0fceae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""