LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File gcc-3.3-needs-autoconf-2.13.patch of Package scratchbox (Project home:herzi)

--- compilers/host_gcc/Makefile.orig	2010-01-06 20:32:27.835529766 +0100
+++ compilers/host_gcc/Makefile	2010-01-07 14:09:27.997834800 +0100
@@ -15,6 +15,8 @@ BINSRC     = $(WORKDIR)/$(BINNAME)-$(BIN
 DISTFILES  = $(GCCNAME)_$(GCCVERSION).orig.tar.gz \
              $(GCCNAME)_$(GCCVERSION)-$(GCCPATCH).diff.gz \
              $(GCCNAME)_$(GCCVERSION)-$(GCCPATCH).dsc \
+             gcc-autoconf-2.13.patch \
+             gcc-bison-1.75.patch \
              $(BINNAME)_$(BINVERSION).orig.tar.gz \
              $(BINNAME)_$(BINVERSION)-$(BINPATCH).diff.gz \
              $(BINNAME)_$(BINVERSION)-$(BINPATCH).dsc
@@ -56,6 +57,8 @@ extract-$(BINNAME)_$(BINVERSION).orig.ta
 
 post-extract:
 	cd $(WORKDIR) && dpkg-source -x $(GCCNAME)_$(GCCVERSION)-$(GCCPATCH).dsc
+	cd $(WORKDIR) && patch -p0 < gcc-autoconf-2.13.patch
+	cd $(WORKDIR) && patch -p0 < gcc-bison-1.75.patch
 	$(MAKE) -C $(GCCSRC) -f debian/rules unpack
 
 	cd $(WORKDIR) && dpkg-source -x $(BINNAME)_$(BINVERSION)-$(BINPATCH).dsc
--- compilers/host_gcc/checksums.orig	2009-08-27 15:07:54.000000000 +0200
+++ compilers/host_gcc/checksums	2010-01-07 14:07:03.595834590 +0100
@@ -5,4 +5,6 @@ ea140e23ae50a61a79902aa67da5214e  downlo
 055e74792e7118ddf33ae6b04d640818  download/binutils_2.15-5.diff.gz
 b20cf60b07384592ed5fa71314c6d2d9  download/binutils_2.15-5.dsc
 864f33531adee4451c7ac7248cbe6c78  download/gcc.patch
+d3a8bf9d7b3f241c97aa0da7884d45a2  download/gcc-autoconf-2.13.patch
+724873992989d5df86adfa830b51b033  download/gcc-bison-1.75.patch
 401b86903d331a330144f90b5c0aaacd  download/binutils.patch
--- /dev/null	2010-01-06 10:36:58.100529632 +0100
+++ compilers/host_gcc/files/gcc-autoconf-2.13.patch	2010-01-06 20:32:03.845655023 +0100
@@ -0,0 +1,63 @@
+--- gcc-3.3-3.3.5/debian/patches/libf2c-update.dpatch.orig	2010-01-06 18:20:02.000000000 +0100
++++ gcc-3.3-3.3.5/debian/patches/libf2c-update.dpatch	2010-01-06 20:29:59.371529568 +0100
+@@ -13,10 +13,11 @@ fi
+ case "$1" in
+     -patch)
+         patch $pdir -f --no-backup-if-mismatch -p0 < $0
+-        ( cd ${dir}libf2c && autoconf )
+-        ( cd ${dir}libf2c/libF77 && autoconf )
+-        ( cd ${dir}libf2c/libI77 && autoconf )
+-        ( cd ${dir}libf2c/libU77 && autoconf )
++        echo "running autoconf-2.13"
++        ( cd ${dir}libf2c && autoconf-2.13 )
++        ( cd ${dir}libf2c/libF77 && autoconf-2.13 )
++        ( cd ${dir}libf2c/libI77 && autoconf-2.13 )
++        ( cd ${dir}libf2c/libU77 && autoconf-2.13 )
+         ;;
+     -unpatch)
+         patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+--- gcc-3.3-3.3.5/debian/patches/libffi-no-debug.dpatch.orig	2010-01-07 14:36:52.000000000 +0100
++++ gcc-3.3-3.3.5/debian/patches/libffi-no-debug.dpatch	2010-01-07 14:45:15.098969144 +0100
+@@ -14,11 +14,11 @@ fi
+ case "$1" in
+     -patch)
+         patch $pdir -f --no-backup-if-mismatch -p0 < $0
+-        #cd ${dir}gcc && autoconf
++        cd ${dir}gcc && autoconf-2.13
+         ;;
+     -unpatch)
+         patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+-        #rm ${dir}gcc/configure
++        rm ${dir}gcc/configure
+         ;;
+     *)
+         echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+@@ -26,28 +26,6 @@ case "$1" in
+ esac
+ exit 0
+ 
+-diff -ur gcc-3.3.5/libffi/configure src/libffi/configure
+---- libffi/configure~	2004-05-12 17:13:57.000000000 +0200
+-+++ libffi/configure	2005-03-07 22:08:42.438788715 +0100
+-@@ -3639,18 +3649,6 @@
+- 
+- 
+- 
+--# Check whether --enable-debug or --disable-debug was given.
+--if test "${enable_debug+set}" = set; then
+--  enableval="$enable_debug"
+--  if test "$enable_debug" = "yes"; then
+--    cat >> confdefs.h <<\EOF
+--#define FFI_DEBUG 1
+--EOF
+--
+--  fi
+--fi
+--
+--
+- # Check whether --enable-structs or --disable-structs was given.
+- if test "${enable_structs+set}" = set; then
+-   enableval="$enable_structs"
+ diff -ur gcc-3.3.5/libffi/configure.in src/libffi/configure.in
+ --- libffi/configure.in~	2003-08-09 08:59:00.000000000 +0200
+ +++ libffi/configure.in	2005-03-07 22:08:42.436789315 +0100
--- /dev/null	2010-01-08 16:19:54.100064841 +0100
+++ compilers/host_gcc/files/gcc-bison-1.75.patch	2010-01-08 17:15:07.886186903 +0100
@@ -0,0 +1,12 @@
+--- gcc-3.3-3.3.5/debian/rules2.orig	2010-01-08 17:14:07.630187607 +0100
++++ gcc-3.3-3.3.5/debian/rules2	2010-01-08 17:14:48.448188010 +0100
+@@ -164,6 +164,9 @@ else
+   DEJAGNU_TIMEOUT=450
+ endif
+ 
++# hardcode the name of bison
++CONFARGS += 'BISON=bison-1.75'
++
+ # see if we can find a tiny mail program to send the success story
+ with_mail := $(strip $(shell if [ -x /usr/bin/mailx ]; \
+ 		then echo yes; else echo no; fi))