summaryrefslogtreecommitdiffstats
path: root/development/sdcc/patches/source-tree.patch
diff options
context:
space:
mode:
author Kyle Guinn2016-07-03 07:27:26 +0200
committer Willy Sudiarto Raharjo2016-07-24 02:27:53 +0200
commitb713690435e1936168076cab242968f5e97a6d31 (patch)
treeb0153beb683aee61f03f7d0bdb140547ea5b65bc /development/sdcc/patches/source-tree.patch
parentb3d3d26cc2ae0453ea62e33aab0943a7c0c0e7e1 (diff)
downloadslackbuilds-b713690435e1936168076cab242968f5e97a6d31.tar.gz
development/sdcc: Updated for version 3.6.0.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'development/sdcc/patches/source-tree.patch')
-rw-r--r--development/sdcc/patches/source-tree.patch42
1 files changed, 25 insertions, 17 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
+