summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/sdcc/patches/source-tree.patch42
-rw-r--r--development/sdcc/sdcc.SlackBuild4
-rw-r--r--development/sdcc/sdcc.info6
3 files changed, 30 insertions, 22 deletions
diff --git a/development/sdcc/patches/source-tree.patch b/development/sdcc/patches/source-tree.patch
index d5378e706b..c860f68671 100644
--- a/development/sdcc/patches/source-tree.patch
+++ b/development/sdcc/patches/source-tree.patch
@@ -1,38 +1,46 @@
diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
-@@ -522,11 +522,11 @@
+@@ -527,19 +527,11 @@
+ $(CP_U) -r $(MODELS) mcs51 ds390 ds400 z80 z180 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 $(sdcc_libdir)/src
for src in $(MODELS) ds390 ds400 z80 z180 r2k r3ka tlcs90 gbz80 hc08 s08 stm8 pic14 pic16; do \
- find $(sdcc_libdir)/src/$$src -depth \
+- find $(sdcc_libdir)/src/$$src -depth \
- \( -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 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
- -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
- -name 'bootstrap.sh' \) \
-+ -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o -name 'stamp-h1' -o \
-+ -name 'bootstrap.sh' -o -name '.deps' -o -name '.checkdevices' -o -name '.checksupport' -o -name 'pics.supported' \) \
- -exec rm -rf {} + ; \
+- -exec rm -rf {} + ; \
++ find $(sdcc_libdir)/src/$$src -type f -not -regex '.*\(/[A-Z]+\|\.\(c\|s\|S\|inc\)\)$$' -delete ; \
++ find $(sdcc_libdir)/src/$$src -type d -empty -delete ; \
done
- find $(sdcc_libdir)/src/mcs51 -depth \
+- find $(sdcc_libdir)/src/mcs51 -depth \
+- \( -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lib' -o \
+- -name '*.lst' -o -name '.svn' -o -name 'build' -o -name 'bin' -o \
+- -name 'Makefile*' \) \
+- -exec rm -rf {} +
++ find $(sdcc_libdir)/src/mcs51 -type f -not -regex '.*\(/[A-Z]+\|\.\(c\|s\|S\|asm\|inc\)\)$$' -delete
++ find $(sdcc_libdir)/src/mcs51 -type d -empty -delete
+
+ # Deleting all the installed files
+ # --------------------------------
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
-@@ -357,11 +357,11 @@
+@@ -356,13 +356,8 @@
+ $(CP_U) -r $(foreach p, $(ENABLED_PORTS), $(srcdir)/$(p)) $(sdcc_libdir)/src
for src in $(ENABLED_PORTS); do \
- find $(sdcc_libdir)/src/$$src -depth \
+- find $(sdcc_libdir)/src/$$src -depth \
- \( -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 'build' -o -name 'bin' -o -name 'Makefile*' -o -name 'config*' -o \
- -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o \
- -name 'bootstrap.sh' \) \
-+ -name 'depcomp' -o -name 'missing' -o -name 'install-sh' -o -name 'stamp-h1' -o \
-+ -name 'bootstrap.sh' -o -name '.deps' -o -name '.checkdevices' -o -name '.checksupport' -o -name 'pics.supported' \) \
- -exec rm -rf {} + ; \
+- -exec rm -rf {} + ; \
++ find $(sdcc_libdir)/src/$$src -type f -not -regex '.*\(/[A-Z]+\|\.\(c\|s\|S\|inc\)\)$$' -delete ; \
++ find $(sdcc_libdir)/src/$$src -type d -empty -delete ; \
done
endif
+
diff --git a/development/sdcc/sdcc.SlackBuild b/development/sdcc/sdcc.SlackBuild
index be9c0bfddc..16c8556930 100644
--- a/development/sdcc/sdcc.SlackBuild
+++ b/development/sdcc/sdcc.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for sdcc
-# Copyright 2014-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2014-2016 Kyle Guinn <elyk03@gmail.com>, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=sdcc
-VERSION=${VERSION:-3.5.0}
+VERSION=${VERSION:-3.6.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
diff --git a/development/sdcc/sdcc.info b/development/sdcc/sdcc.info
index f002b488f4..15db9c488d 100644
--- a/development/sdcc/sdcc.info
+++ b/development/sdcc/sdcc.info
@@ -1,8 +1,8 @@
PRGNAM="sdcc"
-VERSION="3.5.0"
+VERSION="3.6.0"
HOMEPAGE="http://sdcc.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/sdcc/sdcc-src-3.5.0.tar.bz2"
-MD5SUM="e0a1df72747c481cdedbbd328b0fceae"
+DOWNLOAD="http://downloads.sourceforge.net/sdcc/sdcc-src-3.6.0.tar.bz2"
+MD5SUM="4c4cf17d8d2b2d37af66c5b7511f62d8"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""