[packages/sdcc] - updated to 3.4.0, cleanup, separated emacs files
qboosh
qboosh at pld-linux.org
Fri Jul 25 17:14:37 CEST 2014
commit ea490d2d979a519adec2993e91d37d90c98e0d20
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jul 25 17:19:52 2014 +0200
- updated to 3.4.0, cleanup, separated emacs files
sdcc-as-build.patch | 84 ------------------------------------
sdcc-gstabs.patch | 20 ---------
sdcc-mcs51-pcall.patch | 14 ------
sdcc-mcs51-stack-probe.patch | 13 ------
sdcc.spec | 100 +++++++++++++++++++++++++++----------------
5 files changed, 62 insertions(+), 169 deletions(-)
---
diff --git a/sdcc.spec b/sdcc.spec
index 005ba2c..d8c44a2 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -5,23 +5,20 @@
Summary: C compiler for Intel 8051 and Zilog Z80
Summary(pl.UTF-8): Kompilator C dla Intel 8051 i Zilog Z80
Name: sdcc
-Version: 3.3.0
+Version: 3.4.0
Release: 1
-License: GPL
+License: GPL v2+ (tools), GPL v2+ with linking exception (runtime)
Group: Development/Languages
Source0: http://downloads.sourceforge.net/sdcc/%{name}-src-%{version}.tar.bz2
-# Source0-md5: c7c6aa75415580795ecc4fd31948e5ba
-Patch0: %{name}-mcs51-pcall.patch
-Patch1: %{name}-mcs51-stack-probe.patch
-Patch2: %{name}-gstabs.patch
+# Source0-md5: 92db2ea2526f6cef412547bb1e759a48
URL: http://sdcc.sourceforge.net/
-BuildRequires: autoconf
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: flex
BuildRequires: gc-devel
BuildRequires: gputils
BuildRequires: libstdc++-devel
+BuildRequires: sed >= 4.0
%if %{with doc}
BuildRequires: latex2html
BuildRequires: lyx >= 1.4.4
@@ -39,35 +36,41 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautostrip .*%{_datadir}/%{name}/.*
%description
-SDCC is retargettable, optimizing ANSI - C compiler. The current
-version targets the Intel 8051 and recently the Zilog Z80 based MCUs.
-SDCC can be retargeted for other 8 bit MCUs or PICs and some day soon
-will be. Supported data types are short (8 bits, 1 byte), char (8
-bits, 1 byte) , int (16 bits, 2 bytes ), long (32 bit, 4 bytes) and
-float (4 byte IEEE). SDCC also comes with the source level debugger
-SDCDB.
+SDCC is retargettable, optimizing ANSI-C compiler. The current version
+targets the Intel 8051 and recently the Zilog Z80 based MCUs. SDCC can
+be retargeted for other 8 bit MCUs or PICs and some day soon will be.
+Supported data types are short (8 bits, 1 byte), char (8 bits, 1
+byte), int (16 bits, 2 bytes), long (32 bit, 4 bytes) and float (4
+byte IEEE). SDCC also comes with the source level debugger SDCDB.
%description -l pl.UTF-8
-SDCC jest kompilatorem ANSI C. Aktualna wersja wspiera procesory Intel
-8051 oraz Zilog Z80. SDCC może być łatwo zmodyfikowany by wspierać
-inne 8 bitowe jednostki. Wspierane typy danych to short (8 bitów, 1
-bajt), char (8 bitów, 1 bajt), int (16 bitów, 2 bajty), long (32 bity,
-4 bajty) oraz float (4 bajty IEEE). SDCC dostarcza również debugger
-oparty na emulatorze ucsim.
+SDCC jest optymalizującym kompilatorem ANSI C dla wielu platform.
+Aktualna wersja obsługuje procesory Intel 8051 oraz Zilog Z80. SDCC
+może być łatwo zmodyfikowany by obsługiwać inne 8-bitowe jednostki.
+Obsługiwane typy danych to short (8 bitów, 1 bajt), char (8 bitów, 1
+bajt), int (16 bitów, 2 bajty), long (32 bity, 4 bajty) oraz float (4
+bajty IEEE). SDCC dostarcza również debugger oparty na emulatorze
+ucsim.
+
+%package -n emacs-sdcdb
+Summary: SDCDB debugger support for Emacs
+Summary(pl.UTF-8): Obsługa debuggera SDCDB dla Emacsa
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: emacs
+
+%description -n emacs-sdcdb
+SDCDB debugger support for Emacs.
+
+%description -n emacs-sdcdb -l pl.UTF-8
+Obsługa debuggera SDCDB dla Emacsa.
%prep
%setup -q
-#%%patch0 -p1
-#%%patch1 -p1
-#%%patch2 -p1
-%build
-#find -type f -name 'configure.??' | while read FILE; do
-# cd $(dirname "$FILE")
-# %{__autoconf}
-# cd -
-#done
+%{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' support/scripts/as2gbmap.py
+%build
%configure \
PDFOPT=/bin/cp \
%{__enable_disable doc} \
@@ -79,10 +82,7 @@ oparty na emulatorze ucsim.
%{__make} -j1
-cd device/lib
-%{__make} -j1 model-mcs51-stack-auto
-%{__make} -j1 model-mcs51-xstack-auto
-cd -
+%{__make} -C device/lib -j1 model-mcs51-stack-auto model-mcs51-xstack-auto
%install
rm -rf $RPM_BUILD_ROOT
@@ -93,9 +93,10 @@ install -d $RPM_BUILD_ROOT%{_libdir}/emacs/site-lisp
"docdir=%{_docdir}/%{name}-%{version}" \
"STRIP=/bin/true"
-# some cleanups in mess generated by make install
-#find $RPM_BUILD_ROOT -name "CVS" -type d | xargs rm -r
-#mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_libdir}/emacs/site-lisp
+# belongs to binutils-devel
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libiberty.a
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_libdir}/emacs/site-lisp
%clean
rm -rf $RPM_BUILD_ROOT
@@ -103,6 +104,29 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc %{_docdir}/%{name}-%{version}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/as2gbmap
+%attr(755,root,root) %{_bindir}/makebin
+%attr(755,root,root) %{_bindir}/packihx
+%attr(755,root,root) %{_bindir}/s51
+%attr(755,root,root) %{_bindir}/savr
+%attr(755,root,root) %{_bindir}/sdar
+%attr(755,root,root) %{_bindir}/sdas*
+%attr(755,root,root) %{_bindir}/sdcc
+%attr(755,root,root) %{_bindir}/sdcclib
+%attr(755,root,root) %{_bindir}/sdcdb
+%attr(755,root,root) %{_bindir}/sdcpp
+%attr(755,root,root) %{_bindir}/sdld*
+%attr(755,root,root) %{_bindir}/sdnm
+%attr(755,root,root) %{_bindir}/sdobjcopy
+%attr(755,root,root) %{_bindir}/sdranlib
+%attr(755,root,root) %{_bindir}/shc08
+%attr(755,root,root) %{_bindir}/sst7
+%attr(755,root,root) %{_bindir}/sstm8
+%attr(755,root,root) %{_bindir}/sxa
+%attr(755,root,root) %{_bindir}/sz80
%{_datadir}/%{name}
-#%{_libdir}/emacs/site-lisp/*.el
+
+%files -n emacs-sdcdb
+%defattr(644,root,root,755)
+%{_libdir}/emacs/site-lisp/sdcdb.el
+%{_libdir}/emacs/site-lisp/sdcdbsrc.el
diff --git a/sdcc-as-build.patch b/sdcc-as-build.patch
deleted file mode 100644
index ae38369..0000000
--- a/sdcc-as-build.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -urN sdcc.orig/sdas/as6808/Makefile.in sdcc/sdas/as6808/Makefile.in
---- sdcc.orig/sdas/as6808/Makefile.in 2010-08-03 22:09:57.016409271 +0200
-+++ sdcc/sdas/as6808/Makefile.in 2010-08-03 22:11:20.631407187 +0200
-@@ -36,7 +36,7 @@
-
- CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
- CFLAGS = @CFLAGS@ @WALL_FLAG@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
--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/sdas/as8051/Makefile.in sdcc/sdas/as8051/Makefile.in
---- sdcc.orig/sdas/as8051/Makefile.in 2010-08-03 22:09:57.017408239 +0200
-+++ sdcc/sdas/as8051/Makefile.in 2010-08-03 22:11:00.094409806 +0200
-@@ -36,7 +36,7 @@
-
- CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
- CFLAGS = @CFLAGS@ @WALL_FLAG@ -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
--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/sdas/asgb/Makefile.in sdcc/sdas/asgb/Makefile.in
---- sdcc.orig/sdas/asgb/Makefile.in 2010-08-03 22:09:57.017408239 +0200
-+++ sdcc/sdas/asgb/Makefile.in 2010-08-03 22:11:09.430533066 +0200
-@@ -36,7 +36,7 @@
-
- CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
- CFLAGS = @CFLAGS@ @WALL_FLAG@ -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
--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/sdas/asz80/Makefile.in sdcc/sdas/asz80/Makefile.in
---- sdcc.orig/sdas/asz80/Makefile.in 2010-08-03 22:09:57.018408442 +0200
-+++ sdcc/sdas/asz80/Makefile.in 2010-08-03 22:11:32.487532881 +0200
-@@ -36,7 +36,7 @@
-
- CPPFLAGS = @CPPFLAGS@ -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
- CFLAGS = @CFLAGS@ @WALL_FLAG@ -DINDEXLIB -I. -I$(srcdir) -I$(srcdir)/../asxxsrc -I$(srcdir)/../../support/Util
--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-gstabs.patch b/sdcc-gstabs.patch
deleted file mode 100644
index da44cd5..0000000
--- a/sdcc-gstabs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
---- sdcc.orig/sim/ucsim/configure.in 2010-04-14 14:10:25.000000000 +0200
-+++ sdcc/sim/ucsim/configure.in 2010-06-16 15:56:39.000000000 +0200
-@@ -510,15 +510,7 @@
-
- # This is the first time when CFLAGS are set/modified!!
-
-- bor_IS_VALID_OPTION(ggdb)
-- bor_IS_VALID_OPTION(gstabs)
-- if test "$ucsim_cv_cxx_gstabs" = "yes"; then
-- gopt="-gstabs+ -g3"
-- elif test "$ucsim_cv_cxx_ggdb" = "yes"; then
-- gopt="-ggdb -g3"
-- else
-- gopt="-g"
-- fi
-+ gopt="-g"
- if test "$CXXFLAGS"x = x ;then
- CXXFLAGS="$gopt"
- else
diff --git a/sdcc-mcs51-pcall.patch b/sdcc-mcs51-pcall.patch
deleted file mode 100644
index 8f85083..0000000
--- a/sdcc-mcs51-pcall.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN sdcc.orig/src/SDCCast.c sdcc/src/SDCCast.c
---- sdcc.orig/src/SDCCast.c 2008-09-07 14:50:06.000000000 +0200
-+++ sdcc/src/SDCCast.c 2008-11-06 09:46:22.000000000 +0100
-@@ -783,8 +783,8 @@
- /* if the function is being called via a pointer & */
- /* it has not been defined reentrant then we cannot */
- /* have parameters */
-- /* PIC16 port can... */
-- if (!TARGET_IS_PIC16)
-+ /* PIC16 and MCS51 port can... */
-+ if (!TARGET_IS_PIC16 && !TARGET_IS_MCS51)
- {
- if (func->type != EX_VALUE && !IFFUNC_ISREENT (functype) && !options.stackAuto)
- {
diff --git a/sdcc-mcs51-stack-probe.patch b/sdcc-mcs51-stack-probe.patch
deleted file mode 100644
index 5431b69..0000000
--- a/sdcc-mcs51-stack-probe.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN sdcc.orig/src/mcs51/gen.c sdcc/src/mcs51/gen.c
---- sdcc.orig/src/mcs51/gen.c 2007-07-18 17:17:51.000000000 +0200
-+++ sdcc/src/mcs51/gen.c 2007-08-16 08:25:04.000000000 +0200
-@@ -3336,6 +3336,9 @@
- emitcode(";", "naked function: no prologue.");
- return;
- }
-+
-+ if (options.stack_probe)
-+ emitcode ("lcall","__stack_probe");
-
- /* here we need to generate the equates for the
- register bank if required */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sdcc.git/commitdiff/ea490d2d979a519adec2993e91d37d90c98e0d20
More information about the pld-cvs-commit
mailing list