9 files changed, 95 insertions, 48 deletions

diff --git a/lang/sdcc-devel/files/patch-Makefile.in b/lang/sdcc-devel/files/patch-Makefile.in
new file mode 100644
index 000000000000..4815ced1f3a4
--- /dev/null
+++ b/lang/sdcc-devel/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Thu May 11 22:06:55 2006
++++ Makefile.in	Thu Jun 29 16:05:04 2006
+@@ -27,6 +27,10 @@
+ ifeq ($(OPT_DISABLE_MCS51), 0)
+ SDCC_ASLINK     += as/mcs51
+ SDCC_MISC	+= debugger/mcs51
++else
++ifeq ($(OPT_DISABLE_DS390), 0)
++SDCC_ASLINK     += as/mcs51
++endif
+ endif
+ 
+ ifeq ($(OPT_DISABLE_Z80), 0)
diff --git a/lang/sdcc-devel/files/patch-configure.in b/lang/sdcc-devel/files/patch-configure.in
new file mode 100644
index 000000000000..85ea08513d55
--- /dev/null
+++ b/lang/sdcc-devel/files/patch-configure.in
@@ -0,0 +1,21 @@
+--- configure.in.orig	Thu May 11 22:06:55 2006
++++ configure.in	Wed Jun 28 22:22:07 2006
+@@ -634,6 +634,10 @@
+ 
+ test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
+ 
++if test $OPT_DISABLE_DS390 = 0 -o $OPT_DISABLE_MCS51 = 0; then
++  AC_CONFIG_FILES([as/mcs51/Makefile])
++fi
++
+ if test $OPT_DISABLE_DS390 = 0; then
+   AC_CONFIG_FILES([src/ds390/Makefile])
+   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/ds390/Makefile])
+@@ -652,7 +656,6 @@
+ 
+ if test $OPT_DISABLE_MCS51 = 0; then
+   AC_CONFIG_FILES([src/mcs51/Makefile
+-                   as/mcs51/Makefile
+                    debugger/mcs51/Makefile])
+   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/mcs51/Makefile
+                                                        device/lib/small/Makefile
diff --git a/lang/sdcc-devel/files/patch-device-lib-Makefile.in b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
index b044c1a9ac18..9d0730ac6ceb 100644
--- a/lang/sdcc-devel/files/patch-device-lib-Makefile.in
+++ b/lang/sdcc-devel/files/patch-device-lib-Makefile.in
@@ -1,27 +1,40 @@
---- device/lib/Makefile.in.orig	Tue Nov 15 18:23:59 2005
-+++ device/lib/Makefile.in	Tue Nov 15 18:24:18 2005
-@@ -285,8 +285,6 @@
+--- device/lib/Makefile.in.orig	Sat Jun 17 16:43:52 2006
++++ device/lib/Makefile.in	Wed Jun 28 19:08:03 2006
+@@ -337,23 +337,6 @@
  # ---------------------------------------------------
  install: all installdirs
  	$(CP_U) -r $(BUILDDIR)/* $(sdcc_libdir)
--	$(CP_U) -r ds390 ds400 gbz80 z80 hc08 *.c $(sdcc_libdir)/src
--	rm -r `find $(sdcc_libdir)/src -name '*.rel' -o -name '*.dump*' -o -name '*.sym' -o -name '*.o' -o -name '*.lst' -o -name '*.asm' -o -name 'CVS'`
+-	$(CP_U) -r $(MODELS) $(srcdir)/mcs51 $(srcdir)/ds390 $(srcdir)/ds400 \
+-	                     $(srcdir)/gbz80 $(srcdir)/z80 $(srcdir)/hc08 \
+-	                     $(srcdir)/pic $(srcdir)/pic16 $(srcdir)/*.c $(sdcc_libdir)/src
+-	$(CP_U) -r $(MODELS) mcs51 ds390 ds400 gbz80 z80 hc08 $(sdcc_libdir)/src
+-
+-	for src in $(MODELS) ds390 ds400 gbz80 z80 hc08 pic pic16; do \
+-	  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 'build' -o -name 'bin' -o \
+-	    -name 'Makefile*' \) \
+-	    -exec rm -r {} \; ; \
+-	done
+-	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 -r {} \;
  
  # Deleting all the installed files
  # --------------------------------
-@@ -307,16 +305,6 @@
+@@ -374,14 +357,6 @@
  # ---------------------------------
  installdirs:
  	[ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
 -	for model in $(MODELS); do \
--	 [ -d $(sdcc_libdir)/$$model ] || \
--	 mkdir -p $(sdcc_libdir)/$$model; \
+-	  [ -d $(sdcc_libdir)/$$model ] || \
+-	  mkdir -p $(sdcc_libdir)/$$model; \
+-	done
+-	for libdir in small-stack-auto ds390 ds400 hc08 pic16 pic; do \
+-	  [ -d $(sdcc_libdir)/$$libdir ] || mkdir -p $(sdcc_libdir)/$$libdir; \
 -	done
--	[ -d $(sdcc_libdir)/ds390 ] || mkdir -p $(sdcc_libdir)/ds390
--	[ -d $(sdcc_libdir)/ds400 ] || mkdir -p $(sdcc_libdir)/ds400
--	[ -d $(sdcc_libdir)/hc08 ] || mkdir -p $(sdcc_libdir)/hc08
--	[ -d $(sdcc_libdir)/pic16 ] || mkdir -p $(sdcc_libdir)/pic16
--	[ -d $(sdcc_libdir)/pic ] || mkdir -p $(sdcc_libdir)/pic
 -	mkdir -p $(sdcc_libdir)/src
  
  # Creating dependencies
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in
index 8dcbc3e79a13..5841fddbebe9 100644
--- a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in
+++ b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.common.in
@@ -1,32 +1,32 @@
---- device/lib/pic/Makefile.common.in.orig	Tue Nov 15 18:34:37 2005
-+++ device/lib/pic/Makefile.common.in	Tue Nov 15 18:35:07 2005
+--- device/lib/pic/Makefile.common.in.orig	Mon May  1 22:47:12 2006
++++ device/lib/pic/Makefile.common.in	Wed Jun 28 17:27:29 2006
 @@ -12,7 +12,6 @@
- ### $Id: Makefile.common.in,v 1.1 2005/09/23 21:59:29 tecodev Exp $
+ ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
  ###
  
 -SHELL = bash
  
  #################################################
  ### verboseness
-@@ -23,10 +22,10 @@
- 
+@@ -24,10 +23,10 @@
  #################################################
  ### compiler switches
--ARCH   ?= 877		# might be overwritten in libio
-+PICARCH   ?= 877		# might be overwritten in libio
+ # ARCH might be overwritten in libio
+-ARCH   ?= 877
++PICARCH   ?= 877
  
  CFLAGS ?=
 -CFLAGS += -mpic14 -p16f$(ARCH)
 +CFLAGS += -mpic14 -p16f$(PICARCH)
  CFLAGS += --std-c99
- CFLAGS += -I. -I$(topsrcdir)/../../include/pic
+ CFLAGS += -I. -I$(top_srcdir)/../../include/pic
  
-@@ -53,7 +52,7 @@
+@@ -54,7 +53,7 @@
  #################################################
  ### assembler switches
  ASFLAGS ?=
 -ASFLAGS += -pp16f$(ARCH)
 +ASFLAGS += -pp16f$(PICARCH)
- ASFLAGS += -I$(topsrcdir)/../../include/pic
+ ASFLAGS += -I$(top_srcdir)/../../include/pic
+ ASFLAGS += -I. -I$(srcdir)
  
- #################################################
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules
index 983683383e81..2cca46ac5f16 100644
--- a/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules
+++ b/lang/sdcc-devel/files/patch-device-lib-pic-Makefile.rules
@@ -1,11 +1,11 @@
---- device/lib/pic/Makefile.rules.orig	Tue Nov 15 18:36:58 2005
-+++ device/lib/pic/Makefile.rules	Tue Nov 15 18:37:18 2005
-@@ -46,7 +46,7 @@
+--- device/lib/pic/Makefile.rules.orig	Mon May  1 22:47:12 2006
++++ device/lib/pic/Makefile.rules	Thu Jun 29 00:39:50 2006
+@@ -56,7 +56,7 @@
  ifneq (,$(strip $(SUBDIRS)))
  recurse : force
  	$(Q)+for DIR in $(SUBDIRS) ; do \
 -		$(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
 +		$(GREP) "^$${PICARCH}$$" "$${DIR}.ignore" 2>&1 /dev/null || ( \
- 			[ -d "$(topsrcdir)/$(builddir)/$${DIR}" ] || $(MKDIR) "$(topsrcdir)/$(builddir)/$${DIR}"; \
+ 			$(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
  			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
  		) || exit 1; \
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
index 4cb675160346..6e9a61f39a43 100644
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.common.in
@@ -1,7 +1,7 @@
---- device/lib/pic16/Makefile.common.in.orig	Sat Aug 20 12:27:03 2005
-+++ device/lib/pic16/Makefile.common.in	Sat Sep  3 20:21:43 2005
+--- device/lib/pic16/Makefile.common.in.orig	Mon May  1 22:47:12 2006
++++ device/lib/pic16/Makefile.common.in	Wed Jun 28 17:35:09 2006
 @@ -16,7 +16,6 @@
- ### $Id: Makefile.common.in,v 1.10 2005/08/20 10:27:03 sdcc-builder Exp $
+ ### $Id: Makefile.common.in 4148 2006-05-01 20:47:12Z tecodev $
  ###
  
 -SHELL = bash
@@ -19,7 +19,7 @@
 -CFLAGS += -mpic16 -p18f$(ARCH)
 +CFLAGS += -mpic16 -p18f$(PICARCH)
  CFLAGS += --std-c99
- CFLAGS += -I. -I$(topsrcdir)/../../include/pic16
+ CFLAGS += -I. -I$(top_srcdir)/../../include/pic16
  
 @@ -63,7 +62,7 @@
  #################################################
@@ -27,6 +27,6 @@
  ASFLAGS ?=
 -ASFLAGS += -pp18f$(ARCH)
 +ASFLAGS += -pp18f$(PICARCH)
- ASFLAGS += -I$(topsrcdir)/../../include/pic16
+ ASFLAGS += -I$(top_srcdir)/../../include/pic16
+ ASFLAGS += -I$(srcdir)
  
- #################################################
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
index d834c2d9e0dc..ee9903adff1b 100644
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-Makefile.rules
@@ -1,11 +1,11 @@
---- device/lib/pic16/Makefile.rules.orig	Sat Sep  3 20:19:06 2005
-+++ device/lib/pic16/Makefile.rules	Sat Sep  3 20:19:50 2005
-@@ -48,7 +48,7 @@
+--- device/lib/pic16/Makefile.rules.orig	Mon May  1 22:47:12 2006
++++ device/lib/pic16/Makefile.rules	Thu Jun 29 00:40:44 2006
+@@ -58,7 +58,7 @@
  ifneq (,$(strip $(SUBDIRS)))
  recurse : force
  	$(Q)+for DIR in $(SUBDIRS) ; do \
--		$(GREP) "^$${ARCH}$$" "$${DIR}.ignore" &> /dev/null || ( \
-+		$(GREP) "^$${PICARCH}$$" "$${DIR}.ignore" 2>&1 > /dev/null || ( \
- 			[ -d "$(topsrcdir)/$(builddir)/$${DIR}" ] || $(MKDIR) "$(topsrcdir)/$(builddir)/$${DIR}"; \
+-		$(GREP) "^$${ARCH}$$" "$(srcdir)/$${DIR}.ignore" &> /dev/null || ( \
++		$(GREP) "^$${PICARCH}$$" "$(srcdir)/$${DIR}.ignore" 2>&1 /dev/null || ( \
+ 			$(MKDIR) "$(top_builddir)$(builddir)/$${DIR}"; \
  			$(MAKE) -C "$${DIR}" builddir="$(builddir)/$${DIR}" $(MAKECMDGOALS); \
  		) || exit 1; \
diff --git a/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile b/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
index 74ae3ed7a3c7..ba1c24193692 100644
--- a/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
+++ b/lang/sdcc-devel/files/patch-device-lib-pic16-libio-Makefile
@@ -1,9 +1,9 @@
---- device/lib/pic16/libio/Makefile.orig	Sat Sep  3 20:23:48 2005
-+++ device/lib/pic16/libio/Makefile	Sat Sep  3 20:22:58 2005
-@@ -35,7 +35,7 @@
+--- device/lib/pic16/libio/Makefile.in.orig	Mon May  1 22:47:12 2006
++++ device/lib/pic16/libio/Makefile.in	Wed Jun 28 17:40:48 2006
+@@ -38,7 +38,7 @@
  		| while read arch; do \
  			[ "x$${arch}" = "x" ] \
- 			|| ( [ -d "$(builddir)/$${arch}" ] || $(MKDIR) "$(builddir)/$${arch}"; \
+ 			|| ( $(MKDIR) "$(top_builddir)$(builddir)/$${arch}"; \
 -				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} ARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
 +				$(MAKE) MKLIB=libio18f$${arch}.lib builddir=$(builddir)/$${arch} PICARCH=$${arch} IO_ARCH=$${arch} $(MAKECMDGOALS); ) \
  			|| exit 1; \
diff --git a/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in b/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in
index 67914d85174f..6edf30962522 100644
--- a/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in
+++ b/lang/sdcc-devel/files/patch-sim-ucsim-cmd.src-Makefile.in
@@ -1,10 +1,10 @@
---- sim/ucsim/cmd.src/Makefile.in.orig	Thu Apr  7 13:42:10 2005
-+++ sim/ucsim/cmd.src/Makefile.in	Thu Apr  7 13:42:26 2005
-@@ -43,7 +43,7 @@
+--- sim/ucsim/cmd.src/Makefile.in.orig	Mon Apr 24 23:19:58 2006
++++ sim/ucsim/cmd.src/Makefile.in	Wed Jun 28 17:19:54 2006
+@@ -45,7 +45,7 @@
  		  cmduc.o cmdstat.o cmdmem.o \
  		  cmdpars.o cmdlex.o
  
--DEVEL		= $(shell ( bash -c "test -e $(PRJDIR)/devel && echo yes" ))
+-DEVEL		= $(shell ( bash -c "test -e $(top_builddir)devel && echo yes" ))
 +DEVEL		= no
  
  # Compiling entire program or any subproject