[IPCop-cvs] ipcop/lfs gcc,1.18.2.9,1.18.2.10

[Gilles E. <ges...@us...>]

Update of /cvsroot/ipcop/ipcop/lfs
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2457/lfs

Modified Files:
      Tag: IPCOP_v1_4_0
	gcc 
Log Message:
Commit Ivan fix for ppc and replace the sed fix for gcc with a patch


Index: gcc
===================================================================
RCS file: /cvsroot/ipcop/ipcop/lfs/gcc,v
retrieving revision 1.18.2.9
retrieving revision 1.18.2.10
diff -C2 -d -r1.18.2.9 -r1.18.2.10
*** gcc	22 Jan 2006 21:58:23 -0000	1.18.2.9
--- gcc	28 Mar 2008 20:25:32 -0000	1.18.2.10
***************
*** 57,62 ****
    EXTRA_CONFIG = --prefix=/tools --with-local-prefix=/tools \
      --disable-nls --enable-shared --enable-languages=c
!   EXTRA_MAKE = BOOT_LDFLAGS="-static" bootstrap
    EXTRA_INSTALL = 
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools2
--- 57,65 ----
    EXTRA_CONFIG = --prefix=/tools --with-local-prefix=/tools \
      --disable-nls --enable-shared --enable-languages=c
!   EXTRA_MAKE = bootstrap
    EXTRA_INSTALL = 
+ ifeq "$(GCCmajor)" "4"
+ 	TOOLCHAIN_CC = CC="gcc -B/usr/bin"
+ endif
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools2
***************
*** 120,130 ****
  	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
  	cd $(DIR_SRC) && tar jxf $(DIR_DL)/gcc-g++-$(VER).tar.bz2
- 	# fix a macro in gcc3.3.3 hurting gcc4.x !
- 	cd $(DIR_APP) && sed -i "s/\*((void \*\*)__o.*;/*((void **)__o->next_free) = ((void *)datum); __o->next_free += sizeof(void *);/" include/obstack.h
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/gcc-3.3-ssp-4.patch
  	cd $(DIR_APP) && sed -i -e 's|^\(LIBGCC2_CFLAGS.*\)$$|\1 -D_LIBC_PROVIDES_SSP_|' gcc/Makefile.in
  ifeq "$(ROOT)" ""
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-no_fixincludes-1.patch
  else
  ifeq "$(LFS_PASS)" "2"
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-no_fixincludes-1.patch
--- 123,135 ----
  	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
  	cd $(DIR_SRC) && tar jxf $(DIR_DL)/gcc-g++-$(VER).tar.bz2
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/gcc-3.3-ssp-4.patch
  	cd $(DIR_APP) && sed -i -e 's|^\(LIBGCC2_CFLAGS.*\)$$|\1 -D_LIBC_PROVIDES_SSP_|' gcc/Makefile.in
+ 
  ifeq "$(ROOT)" ""
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-no_fixincludes-1.patch
  else
+ ifeq "$(GCCmajor)" "4"
+ 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-obstack.h.patch
+ endif
  ifeq "$(LFS_PASS)" "2"
  	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/$(THISAPP)-no_fixincludes-1.patch
***************
*** 133,139 ****
  endif
  	@mkdir $(DIR_SRC)/gcc-build
! 	cd $(DIR_SRC)/gcc-build && /bin/bash $(DIR_APP)/configure $(EXTRA_CONFIG)
  	cd $(DIR_SRC)/gcc-build && make -j 3 $(EXTRA_MAKE)
  	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
  ifeq "$(ROOT)" ""
  	GCC_SPECS_DIR="`/usr/bin/gcc --print-libgcc-file-name`"; \
--- 138,145 ----
  endif
  	@mkdir $(DIR_SRC)/gcc-build
! 	cd $(DIR_SRC)/gcc-build && $(TOOLCHAIN_CC) /bin/bash ../$(THISAPP)/configure $(EXTRA_CONFIG)
  	cd $(DIR_SRC)/gcc-build && make -j 3 $(EXTRA_MAKE)
  	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
+ 
  ifeq "$(ROOT)" ""
  	GCC_SPECS_DIR="`/usr/bin/gcc --print-libgcc-file-name`"; \