- updated to 2.9.4 (snap 20091108)

- fixed build on SMP machines.

Changed files:
    sdcc-as-build.patch -> 1.1
    sdcc.spec -> 1.45

diff --git a/sdcc-as-build.patch b/sdcc-as-build.patch
new file mode 100644 (file)
index 0000000..8760051
--- /dev/null
+++ b/sdcc-as-build.patch
@@ -0,0 +1,84 @@
+diff -urN sdcc.orig/as/asgb/Makefile.in sdcc/as/asgb/Makefile.in
+--- sdcc.orig/as/asgb/Makefile.in      2009-10-17 17:18:45.000000000 +0200
++++ sdcc/as/asgb/Makefile.in   2009-11-08 20:30:47.000000000 +0100
+@@ -36,7 +36,7 @@
+ CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ CFLAGS          = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ M_OR_MM         = @M_OR_MM@
+-LDFLAGS         = @LDFLAGS@ -lm
++LDFLAGS         = @LDFLAGS@
+ 
+ OBJDIR = obj
+ 
+@@ -65,7 +65,7 @@
+ all: checkconf $(ASX)
+ 
+ $(ASX): $(ASOBJECTS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) -lm
+ 
+ # Compiling and installing everything and running test
+ # ----------------------------------------------------
+diff -urN sdcc.orig/as/hc08/Makefile.in sdcc/as/hc08/Makefile.in
+--- sdcc.orig/as/hc08/Makefile.in      2009-10-17 17:18:45.000000000 +0200
++++ sdcc/as/hc08/Makefile.in   2009-11-08 20:31:08.000000000 +0100
+@@ -36,7 +36,7 @@
+ CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ CFLAGS          = @CFLAGS@ -Wall -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ M_OR_MM         = @M_OR_MM@
+-LDFLAGS         = @LDFLAGS@ -lm
++LDFLAGS         = @LDFLAGS@
+ 
+ OBJDIR = obj
+ 
+@@ -65,7 +65,7 @@
+ all: checkconf $(ASX)
+ 
+ $(ASX): $(ASOBJECTS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) -lm
+ 
+ # Compiling and installing everything and running test
+ # ----------------------------------------------------
+diff -urN sdcc.orig/as/mcs51/Makefile.in sdcc/as/mcs51/Makefile.in
+--- sdcc.orig/as/mcs51/Makefile.in     2009-10-17 17:18:45.000000000 +0200
++++ sdcc/as/mcs51/Makefile.in  2009-11-08 20:32:35.000000000 +0100
+@@ -36,7 +36,7 @@
+ CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ CFLAGS          = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ M_OR_MM         = @M_OR_MM@
+-LDFLAGS         = @LDFLAGS@ -lm
++LDFLAGS         = @LDFLAGS@
+ 
+ OBJDIR = obj
+ 
+@@ -65,7 +65,7 @@
+ all: checkconf $(ASX)
+ 
+ $(ASX): $(ASOBJECTS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) -lm
+ 
+ # Compiling and installing everything and running test
+ # ----------------------------------------------------
+diff -urN sdcc.orig/as/z80/Makefile.in sdcc/as/z80/Makefile.in
+--- sdcc.orig/as/z80/Makefile.in       2009-10-17 17:18:45.000000000 +0200
++++ sdcc/as/z80/Makefile.in    2009-11-08 20:32:48.000000000 +0100
+@@ -36,7 +36,7 @@
+ CPPFLAGS        = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ CFLAGS          = @CFLAGS@ -Wall -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
+ M_OR_MM         = @M_OR_MM@
+-LDFLAGS         = @LDFLAGS@ -lm
++LDFLAGS         = @LDFLAGS@
+ 
+ OBJDIR = obj
+ 
+@@ -65,7 +65,7 @@
+ all: checkconf $(ASX)
+ 
+ $(ASX): $(ASOBJECTS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(ASOBJECTS) -lm
+ 
+ # Compiling and installing everything and running test
+ # ----------------------------------------------------

diff --git a/sdcc.spec b/sdcc.spec
index 61296337b6f75c3739258a4b83b9f9b2e4e90691..009615857051f7e309a20367aa3a386a9bd155da 100644 (file)
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,18 +1,19 @@
-%define                _snap_date      20090609
-%define                _snap_id        5467
+%define                _snap_date      20091108
+%define                _snap_id        5568
 
 Summary:       C compiler for Intel 8051 and Zilog Z80
 Summary(pl.UTF-8):     Kompilator C dla Intel 8051 i Zilog Z80
 Name:          sdcc
-Version:       2.9.1
+Version:       2.9.4
 Release:       0.%{_snap_date}.1
 License:       GPL
 Group:         Development/Languages
 Source0:       http://sdcc.sourceforge.net/snapshots/sdcc-src/%{name}-src-%{_snap_date}-%{_snap_id}.tar.bz2
-# Source0-md5: 71479e52e0302d9b01a7fe2a5a27d7c1
+# Source0-md5: b24853361b5276f401a10d936199f669
 Patch0:                %{name}-mcs51-pcall.patch
 Patch1:                %{name}-mcs51-stack-probe.patch
 Patch2:                %{name}-gstabs.patch
+Patch3:                %{name}-as-build.patch
 URL:           http://sdcc.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,6 +57,7 @@ oparty na emulatorze ucsim.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 find -type f -name 'configure.??' | while read FILE; do
@@ -75,8 +77,8 @@ done
 %{__make} -j1
 
 cd device/lib
-%{__make} model-mcs51-stack-auto
-%{__make} model-mcs51-xstack-auto
+%{__make} -j1 model-mcs51-stack-auto
+%{__make} -j1 model-mcs51-xstack-auto
 cd -
 
 %install