rpms/sdcc/F-9 sdcc-2.8.0-configure.diff, NONE, 1.1 sdcc-2.8.0-debugger-makefile.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 sdcc.spec, 1.5, 1.6 sources, 1.2, 1.3

Fri Sep 12 04:02:19 UTC 2008

Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3428

Modified Files:
	.cvsignore sdcc.spec sources 
Added Files:
	sdcc-2.8.0-configure.diff sdcc-2.8.0-debugger-makefile.diff 
Log Message:
* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
- Bump to 2.8.0.
- Patch configure to not mess up CFLAGS.
- Patch debugger Makefile to not break canonicalized paths.

sdcc-2.8.0-configure.diff:

--- NEW FILE sdcc-2.8.0-configure.diff ---
diff -r -U 5 sdcc.orig/configure sdcc/configure
--- sdcc.orig/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure	2008-09-09 02:29:24.000000000 -0700
@@ -2516,11 +2516,11 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
-   CFLAGS="-g"
+:  CFLAGS="-g"
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2554,11 +2554,11 @@
   ac_cv_prog_cc_g=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	CFLAGS=""
+:	CFLAGS=""
       cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2593,11 +2593,11 @@
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+:	 CFLAGS="-g"
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
@@ -2646,22 +2646,22 @@
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
+: CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+:   CFLAGS="-g -O2"
   else
-    CFLAGS="-g"
+:   CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+:   CFLAGS="-O2"
   else
-    CFLAGS=
+:   CFLAGS=
   fi
 fi
 { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -3794,11 +3794,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCggdb" >&5
 echo "${ECHO_T}$sdcc_cv_CCggdb" >&6; }
 
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 
 { echo "$as_me:$LINENO: checking whether $CC accepts -pipe" >&5
 echo $ECHO_N "checking whether $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3819,11 +3819,11 @@
 fi
 { echo "$as_me:$LINENO: result: $sdcc_cv_CCpipe" >&5
 echo "${ECHO_T}$sdcc_cv_CCpipe" >&6; }
 
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/configure.in sdcc/configure.in
--- sdcc.orig/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/configure.in	2008-09-09 02:29:33.000000000 -0700
@@ -321,16 +321,16 @@
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 adl_DD_COPT(CC, ggdb)
 if test "$sdcc_cv_CCggdb" = "yes"; then
-  CFLAGS="-ggdb ${CFLAGS}"
+: CFLAGS="-ggdb ${CFLAGS}"
 fi
 
 adl_DD_COPT(CC, pipe)
 if test "$sdcc_cv_CCpipe" = "yes"; then
-  CFLAGS="-pipe $CFLAGS"
+: CFLAGS="-pipe $CFLAGS"
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
diff -r -U 5 sdcc.orig/sim/ucsim/configure sdcc/sim/ucsim/configure
--- sdcc.orig/sim/ucsim/configure	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure	2008-09-09 02:30:25.000000000 -0700
@@ -12458,15 +12458,15 @@
 fi
 { echo "$as_me:$LINENO: result: $ucsim_cv_CXXgstabs" >&5
 echo "${ECHO_T}$ucsim_cv_CXXgstabs" >&6; }
 
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"
diff -r -U 5 sdcc.orig/sim/ucsim/configure.in sdcc/sim/ucsim/configure.in
--- sdcc.orig/sim/ucsim/configure.in	2008-09-09 02:27:26.000000000 -0700
+++ sdcc/sim/ucsim/configure.in	2008-09-09 02:30:13.000000000 -0700
@@ -517,15 +517,15 @@
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
 DD_COPT(CXX, gstabs)
 if test "$ucsim_cv_CXXgstabs" = "yes"; then
-   gopt="-gstabs+ -g3"
+:  gopt="-gstabs+ -g3"
 elif test "$ucsim_cv_CXXggdb" = "yes"; then
-     gopt="-ggdb -g3"
+:    gopt="-ggdb -g3"
 else
-     gopt="-g"
+:    gopt="-g"
 fi
 if test "$CXXFLAGS"x = x ;then
         CXXFLAGS="$gopt"
 else
         CXXFLAGS="$CXXFLAGS $gopt"

sdcc-2.8.0-debugger-makefile.diff:

--- NEW FILE sdcc-2.8.0-debugger-makefile.diff ---
--- debugger/mcs51/Makefile.in.orig	2008-09-11 18:06:29.000000000 -0700
+++ debugger/mcs51/Makefile.in	2008-09-11 18:06:34.000000000 -0700
@@ -7,11 +7,11 @@
 CPP		= @CPP@
 INSTALL		= @INSTALL@
 STRIP           = @STRIP@
 
 
-top_builddir	= ../../
+top_builddir	= ../..
 top_srcdir	= @srcdir@/../..
 SLIB		= $(top_builddir)/support/Util
 SDCCLIB		= $(top_builddir)/src
 
 VPATH           = @srcdir@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2007 16:08:20 -0000	1.2
+++ .cvsignore	12 Sep 2008 04:01:48 -0000	1.3
@@ -1 +1 @@
-sdcc-src-2.6.0.tar.gz
+sdcc-src-2.8.0.tar.bz2


Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/sdcc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdcc.spec	3 Mar 2008 10:33:09 -0000	1.5
+++ sdcc.spec	12 Sep 2008 04:01:48 -0000	1.6
@@ -1,15 +1,14 @@
 Name:           sdcc
-Version:        2.6.0
-Release:        12%{?dist}
+Version:        2.8.0
+Release:        1%{?dist}
 Summary:        Small Device C Compiler
-
 Group:          Applications/Engineering
-License:        GPL
-URL:            http://sdcc.sourceforge.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+License:        GPLv2+
+URL:            http://sdcc.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.bz2
 Source1:        README.fedora
-Patch0:         sdcc-2.6.0-configure.diff
-Patch1:         sdcc-2.6.0-sdccman.lyx.patch 
+Patch0:         sdcc-2.8.0-configure.diff
+Patch1:		sdcc-2.8.0-debugger-makefile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -40,29 +39,9 @@
 %prep
 %setup -q -n sdcc
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 find -name '*.[ch]' -exec chmod -x '{}' \;
 
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-< os_install_post~ > os_install_post 
-
 
 %build
 %configure --enable-doc --enable-libgc STRIP=:
@@ -72,16 +51,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT Q=
-mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/doc installed-docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT/%{_bindir}/*.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
-mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
-mv $RPM_BUILD_ROOT/%{_bindir}/* $RPM_BUILD_ROOT/%{_libexecdir}/sdcc
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 
-# Creat lauch scripts in %{_bindir}
-pushd $RPM_BUILD_ROOT/%{_bindir}
+# Create launch scripts in %{_bindir}
+pushd $RPM_BUILD_ROOT%{_bindir}
 for x in ../libexec/sdcc/*; do 
 echo "#!/bin/sh
 PATH=/usr/libexec/sdcc:\$PATH
@@ -90,7 +69,6 @@
 done
 popd
 
-%define __os_install_post . ./os_install_post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -113,6 +91,14 @@
 %{_datadir}/%{name}/lib/*/*.asm
 
 %changelog
+* Tue Sep 9 2008 Conrad Meyer <konrad at tylerc.org> - 2.8.0-1
+- Bump to 2.8.0.
+- Patch configure to not mess up CFLAGS.
+- Patch debugger Makefile to not break canonicalized paths.
+
+* Thu Sep  4 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.6.0-13
+- fix license tag
+
 * Sun Mar 2  2008 Marek Mahut <mmahut at fedoraproject.org> - 2.6.0-12
 - Fixing build problems under GCC 4.3
 
@@ -160,4 +146,3 @@
 
 * Thu Feb 1 2007 Trond Danielsen <trond.danielsen at gmail.com> - 2.6.0-1
 - Initial version.
-


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2007 16:08:20 -0000	1.2
+++ sources	12 Sep 2008 04:01:48 -0000	1.3
@@ -1 +1 @@
-70d6036226d852995237f30c5cb50960  sdcc-src-2.6.0.tar.gz
+1b9c2e581b92d5e3f13bca37c5784080  sdcc-src-2.8.0.tar.bz2


