Update of /cvsroot/leaf/src/bering-uclibc4/source/buildenv
In directory 
sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv9752/source/buildenv

Modified Files:
        buildtool.cfg buildtool.mk 
Log Message:
Migrate to gcc-4.4.4


Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.cfg       6 Jul 2010 23:18:39 -0000       1.3
--- buildtool.cfg       17 Sep 2010 18:08:38 -0000      1.4
***************
*** 25,28 ****
--- 25,33 ----
          Serverpath = /downloads
  </Server>
+ <Server mpfr.org>
+       Type = http
+       Name = www.mpfr.org
+       Serverpath = /
+ </Server>
  
  ###############################
***************
*** 37,41 ****
  
  # binutils
! <File binutils-2.16.1.tar.bz2>
          Server = ftp.gnu.org
        Directory = binutils
--- 42,46 ----
  
  # binutils
! <File binutils-2.20.1.tar.bz2>
          Server = ftp.gnu.org
        Directory = binutils
***************
*** 43,67 ****
  </File>
  
  # gcc
! <File gcc-3.3.3.tar.bz2>
      Server = gcc.mirror
!       Directory = releases/gcc-3.3.3
        envname = GCCTAR
  </File>
! <File gcc-3.3-libstdc++nowchar.patch>
!       Server = cvs4-sourceforge
!       Directory = buildenv
!       Revision = HEAD 
! </File>
! <File gcc-obstack.h.patch>
!       Server = cvs4-sourceforge
!       Directory = buildenv
!       Revision = HEAD 
! </File>
! <File gcc-open.patch>
!       Server = cvs4-sourceforge
!       Directory = buildenv
!       Revision = HEAD 
! </File>
  
  <File uname>
--- 48,86 ----
  </File>
  
+ # gmp
+ <File gmp-4.3.2.tar.bz2>
+         Server = ftp.gnu.org
+       Directory = gmp
+       Envname = GMP_TARFILE
+ </File>
+ 
+ # gmp
+ <File mpfr-2.3.2.tar.bz2>
+         Server = mpfr.org
+       Directory = mpfr-2.3.2
+       Envname = MPFR_TARFILE
+ </File>
+ 
  # gcc
! <File gcc-4.4.4.tar.bz2>
      Server = gcc.mirror
!       Directory = releases/gcc-4.4.4
        envname = GCCTAR
  </File>
! #<File gcc-3.3-libstdc++nowchar.patch>
! #     Server = cvs4-sourceforge
! #     Directory = buildenv
! #     Revision = HEAD 
! #</File>
! #<File gcc-obstack.h.patch>
! #     Server = cvs4-sourceforge
! #     Directory = buildenv
! #     Revision = HEAD 
! #</File>
! #<File gcc-open.patch>
! #     Server = cvs4-sourceforge
! #     Directory = buildenv
! #     Revision = HEAD 
! #</File>
  
  <File uname>

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/buildenv/buildtool.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** buildtool.mk        30 Aug 2010 15:33:29 -0000      1.3
--- buildtool.mk        17 Sep 2010 18:08:38 -0000      1.4
***************
*** 37,43 ****
  MULTILIB:=--enable-multilib
  
! GCC_VERSION:=3.3.3
  UCLIBC_VERSION:=0.9.30.3
! BINUTILS_VERSION:=2.16.1
  
  ###########################################################
--- 37,45 ----
  MULTILIB:=--enable-multilib
  
! GCC_VERSION:=4.4.4
! GMP_VERSION:=4.3.2
! MPFR_VERSION:=2.3.2
  UCLIBC_VERSION:=0.9.30.3
! BINUTILS_VERSION:=2.20.1
  
  ###########################################################
***************
*** 77,81 ****
--- 79,89 ----
  GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)
  
+ GMP_SOURCE:=$(GMP_TARFILE)
+ GMP_DIR:=$(TOOL_BUILD_DIR)/gmp-$(GMP_VERSION)
+ GMP_TARGET_DIR:=$(BT_BUILD_DIR)/gmp
  
+ MPFR_SOURCE:=$(MPFR_TARFILE)
+ MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)
+ MPFR_TARGET_DIR:=$(BT_BUILD_DIR)/mpfr
  
  #############################################################
***************
*** 133,143 ****
        #
        -perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = 
true,g;" \
!               $(BINUTILS_DIR)/ld/ldmain.c
        #
        # Hack binutils to use the correct shared lib loader
        #
        (cd $(BINUTILS_DIR); perl -i -p -e 
"s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"\
!               ,#define ELF_DYNAMIC_INTERPRETER \"/lib/ld-uClibc.so.0\",;" \
!               `grep -lr "#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"" 
$(BINUTILS_DIR)`);
        #
        # Hack binutils to prevent it from searching the host system
--- 141,154 ----
        #
        -perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = 
true,g;" \
!       $(BINUTILS_DIR)/ld/ldmain.c
        #
        # Hack binutils to use the correct shared lib loader
        #
        (cd $(BINUTILS_DIR); perl -i -p -e 
"s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"\
!       ,#define ELF_DYNAMIC_INTERPRETER \"/lib/ld-uClibc.so.0\",;" \
!       `grep -lr "#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"" 
$(BINUTILS_DIR)`);
!       (cd $(BINUTILS_DIR); perl -i -p -e "s,/lib/ld-linux.so[\.0-9]*,\
!       /lib/ld-uClibc.so.0,;" \
!       `grep -lr "#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"" 
$(BINUTILS_DIR)`);
        #
        # Hack binutils to prevent it from searching the host system
***************
*** 151,155 ****
  $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
        mkdir -p $(BINUTILS_DIR1)
!       (cd $(BINUTILS_DIR1); CC=$(HOSTCC) CFLAGS="-fno-stack-protector" \
                $(BINUTILS_DIR)/configure \
                --target=$(GNU_TARGET_NAME) \
--- 162,166 ----
  $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
        mkdir -p $(BINUTILS_DIR1)
!       (cd $(BINUTILS_DIR1); CC=$(HOSTCC) \
                $(BINUTILS_DIR)/configure \
                --target=$(GNU_TARGET_NAME) \
***************
*** 223,231 ****
        # Apply any files named gcc-*.patch from the source directory to gcc
  ##    $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) gcc-*.patch
!       (cd $(GCC_DIR) ; patch -p1 < ../gcc-3.3-libstdc++nowchar.patch)
!       (cd $(GCC_DIR) ; patch -p1 < ../gcc-obstack.h.patch)
!       (cd $(GCC_DIR) ; patch -p1 < ../gcc-open.patch)
        # fix configure for bash 3.0
!       perl -i -p -e "s,trap 0,trap - 0,g" $(GCC_DIR)/configure
        touch $(GCC_DIR)/.patched
  
--- 234,242 ----
        # Apply any files named gcc-*.patch from the source directory to gcc
  ##    $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) gcc-*.patch
! #     (cd $(GCC_DIR) ; patch -p1 < ../gcc-3.3-libstdc++nowchar.patch)
! #     (cd $(GCC_DIR) ; patch -p1 < ../gcc-obstack.h.patch)
! #     (cd $(GCC_DIR) ; patch -p1 < ../gcc-open.patch)
        # fix configure for bash 3.0
! #     perl -i -p -e "s,trap 0,trap - 0,g" $(GCC_DIR)/configure
        touch $(GCC_DIR)/.patched
  
***************
*** 234,257 ****
        # Hack things to use the correct shared lib loader
        #
!       (cd $(GCC_DIR); set -e; export LIST="`grep -lr -- 
"-dynamic-linker.*\.so[\.0-9]*" *`";\
                if [ -n "$$LIST" ] ; then \
!               perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
!                   -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
        #
        # Prevent system glibc start files from leaking in uninvited...
        #
!       perl -i -p -e "s,standard_startfile_prefix_1 = 
\".*,standard_startfile_prefix_1 =\
!               \"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
!       perl -i -p -e "s,standard_startfile_prefix_2 = 
\".*,standard_startfile_prefix_2 =\
!               \"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
        #
        # Prevent system glibc include files from leaking in uninvited...
        #
!       perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
!               $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
!       perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
!               $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
        perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define 
STANDARD_INCLUDE_DIR \
!               \"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.h;
        #
        # Prevent system glibc libraries from being found by collect2
--- 245,282 ----
        # Hack things to use the correct shared lib loader
        #
! #     (cd $(GCC_DIR); set -e; export LIST="`grep -lr -- 
"-dynamic-linker.*\.so[\.0-9]*" *`";\
! #             if [ -n "$$LIST" ] ; then \
! #             perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
! #                 -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
!       (cd $(GCC_DIR); set -e; export LIST="`grep -lr -- 
"GLIBC_DYNAMIC_LINKER.*\.so[\.0-9]*" *`";\
                if [ -n "$$LIST" ] ; then \
!               perl -i -p -e "s,GLIBC_DYNAMIC_LINKER.*\".*\.so[\.0-9]*\",\
!       GLIBC_DYNAMIC_LINKER \"/lib/ld-uClibc.so.0\",;" $$LIST; fi);
        #
        # Prevent system glibc start files from leaking in uninvited...
        #
! #     perl -i -p -e "s,standard_startfile_prefix_1 = 
\".*,standard_startfile_prefix_1 =\
! #             \"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
! #     perl -i -p -e "s,standard_startfile_prefix_2 = 
\".*,standard_startfile_prefix_2 =\
! #             \"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
!       perl -i -p -e "s,(STANDARD_STARTFILE_PREFIX_[12]) \"(/usr)?(/lib/\"),\1 
\"$(STAGING_DIR)\2\3,;" \
!       $(GCC_DIR)/gcc/gcc.c;
! #     perl -i -p -e "s,STANDARD_STARTFILE_PREFIX_1 = 
\".*,STANDARD_STARTFILE_PREFIX_1 = \
! #     $(GCC_DIR)/gcc/gcc.c;
! #     perl -i -p -e "s,STANDARD_STARTFILE_PREFIX_2 = 
\".*,STANDARD_STARTFILE_PREFIX_2 = \
! #     \"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
!       perl -i -p -e "s,standard_exec_prefix_1 = \".*,standard_exec_prefix_1 = 
\
!       \"$(STAGING_DIR)/usr/libexec/gcc/\";,;" $(GCC_DIR)/gcc/gcc.c;
!       perl -i -p -e "s,standard_exec_prefix_2 = \".*,standard_exec_prefix_2 = 
\
!       \"$(STAGING_DIR)/usr/lib/gcc/\";,;" $(GCC_DIR)/gcc/gcc.c;
        #
        # Prevent system glibc include files from leaking in uninvited...
        #
!       perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR= \
!       $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
!       perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR= \
!       $(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
        perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define 
STANDARD_INCLUDE_DIR \
!       \"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.c;
        #
        # Prevent system glibc libraries from being found by collect2
***************
*** 265,269 ****
        #
        perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
!               #ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
        touch $(GCC_DIR)/.gcc_build_hacks
        
--- 290,294 ----
        #
        perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
!       #ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
        touch $(GCC_DIR)/.gcc_build_hacks
        
***************
*** 312,320 ****
        PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) \
        AR_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ar \
!       RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ranlib all-gcc
        touch $(GCC_BUILD_DIR1)/.compiled
  
  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
!       PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
        #rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
        #rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc 
$(STAGING_DIR)/share/locale
--- 337,345 ----
        PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) \
        AR_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ar \
!       RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-ranlib all-gcc 
all-stage1-target-libgcc
        touch $(GCC_BUILD_DIR1)/.compiled
  
  $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
!       PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc 
install-target-libgcc
        #rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
        #rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc 
$(STAGING_DIR)/share/locale
***************
*** 362,366 ****
                $(UCLIBC_DIR)/.config
        $(MAKE) -C $(UCLIBC_DIR) oldconfig
!       $(MAKE) -C $(UCLIBC_DIR) \
        PREFIX=$(STAGING_DIR)/ \
        CROSS_COMPILER_PREFIX="" \
--- 387,391 ----
                $(UCLIBC_DIR)/.config
        $(MAKE) -C $(UCLIBC_DIR) oldconfig
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
        PREFIX=$(STAGING_DIR)/ \
        CROSS_COMPILER_PREFIX="" \
***************
*** 377,381 ****
  #     RUNTIME_PREFIX=$(STAGING_DIR)/ \
  #     pregen install_dev;
!       $(MAKE) -C $(UCLIBC_DIR) \
        PREFIX= \
        DEVEL_PREFIX=/ \
--- 402,406 ----
  #     RUNTIME_PREFIX=$(STAGING_DIR)/ \
  #     pregen install_dev;
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
        PREFIX= \
        DEVEL_PREFIX=/ \
***************
*** 384,388 ****
  
  $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
!       $(MAKE) -C $(UCLIBC_DIR) \
        PREFIX= \
        DEVEL_PREFIX=$(STAGING_DIR)/ \
--- 409,413 ----
  
  $(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
        PREFIX= \
        DEVEL_PREFIX=$(STAGING_DIR)/ \
***************
*** 390,401 ****
        install_runtime install_dev 
        
!       $(MAKE) -C $(UCLIBC_DIR) \
        PREFIX=$(STAGING_DIR) \
        install_utils 
        
        # Install uClibc loader for target system
!       $(MAKE) -C $(UCLIBC_DIR) clean
!       $(MAKE) -C $(UCLIBC_DIR) RUNTIME_PREFIX=/ all
        cp $(UCLIBC_DIR)/lib/ld-uClibc-* $(STAGING_DIR)/lib/ld-uClibc-target.so
  
  #ifneq ($(TARGET_DIR),)
--- 415,427 ----
        install_runtime install_dev 
        
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) \
        PREFIX=$(STAGING_DIR) \
        install_utils 
        
        # Install uClibc loader for target system
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) clean
!       $(MAKE) $(MAKEOPTS) -C $(UCLIBC_DIR) RUNTIME_PREFIX=/ all
        cp $(UCLIBC_DIR)/lib/ld-uClibc-* $(STAGING_DIR)/lib/ld-uClibc-target.so
+       touch $(STAGING_DIR)/lib/libc.a
  
  #ifneq ($(TARGET_DIR),)
***************
*** 427,430 ****
--- 453,533 ----
  
  
+ #############################################################
+ #
+ # GMP is required by GCC
+ #
+ #############################################################
+ $(GMP_DIR)/.unpacked: 
+       bzcat $(GMP_SOURCE) | tar -xvf -
+       touch $(GMP_DIR)/.unpacked
+ 
+ gmp-source: $(GMP_DIR)/.unpacked
+ 
+ $(GMP_DIR)/.configured: $(GMP_DIR)/.unpacked 
+       (cd $(GMP_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
+       ./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu 
--prefix=/)
+       touch $(GMP_DIR)/.configured
+ 
+ $(GMP_DIR)/.build: $(GMP_DIR)/.configured
+       $(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" -C 
$(GMP_DIR)
+       mkdir -p $(GMP_TARGET_DIR)
+ #     $(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
+ #         DESTDIR=$(GMP_TARGET_DIR) -C $(GMP_DIR) check
+       $(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
+           DESTDIR=$(GMP_TARGET_DIR) -C $(GMP_DIR) install
+       -$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(GMP_TARGET_DIR)/lib/*
+       -rm -rf $(GMP_TARGET_DIR)/share
+       cp -a $(GMP_TARGET_DIR)/* $(STAGING_DIR)
+       touch $(GMP_DIR)/.build
+       
+ gmp: $(GMP_DIR)/.build
+ 
+ gmp-clean:
+       -$(MAKE) -C $(GMP_DIR) clean
+ 
+ gmp-dirclean:
+       rm -rf $(GMP_DIR)
+ 
+ #############################################################
+ #
+ # MPFR is required by GCC
+ #
+ #############################################################
+ $(MPFR_DIR)/.unpacked: 
+       bzcat $(MPFR_SOURCE) | tar -xvf -
+       perl -i -p -e "s,(['"'"=: ])/(usr/)?lib,\1$(STAGING_DIR)/\2lib,g' \
+               $(MPFR_DIR)/configure
+       touch $(MPFR_DIR)/.unpacked
+ 
+ mpfr-source: $(MPFR_DIR)/.unpacked
+ 
+ $(MPFR_DIR)/.configured: $(MPFR_DIR)/.unpacked $(GMP_DIR)/.build
+       (cd $(MPFR_DIR); CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
+       LDFLAGS="-L$(STAGING_DIR)/lib" \
+       ./configure --build=i386-pc-linux-gnu --host=i386-pc-linux-gnu 
--prefix=/ \
+               --with-gmp=$(STAGING_DIR))
+       touch $(MPFR_DIR)/.configured
+ 
+ $(MPFR_DIR)/.build: $(MPFR_DIR)/.configured
+       $(MAKE) $(MAKEOPTS) CC=$(TARGET_CC) CFLAGS="$(BT_COPT_FLAGS) -m32" \
+       LDFLAGS="-L$(STAGING_DIR)/lib" -C $(MPFR_DIR)
+       mkdir -p $(MPFR_TARGET_DIR)
+ #     $(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
+ #         DESTDIR=$(MPFR_TARGET_DIR) -C $(MPFR_DIR) check
+       $(MAKE) CC=$(TARGET_CC) CFLAGS=$(BT_COPT_CFLAGS) \
+           DESTDIR=$(MPFR_TARGET_DIR) -C $(MPFR_DIR) install
+       -$(BT_STRIP) $(BT_STRIP_LIBOPTS) $(MPFR_TARGET_DIR)/lib/*
+       -rm -rf $(MPFR_TARGET_DIR)/share
+       cp -a $(MPFR_TARGET_DIR)/* $(STAGING_DIR)
+       touch $(MPFR_DIR)/.build
+       
+ mpfr: $(MPFR_DIR)/.build
+ 
+ mpfr-clean:
+       -$(MAKE) -C $(MPFR_DIR) clean
+ 
+ mpfr-dirclean:
+       rm -rf $(MPFR_DIR)
+ 
  
  
***************
*** 437,449 ****
  GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
  
! $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
        #
        # Hack up the soname for libstdc++
        # 
!       perl -i -p -e "s,\.so\.1,.so.0.9.9,g;" 
$(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
!       perl -i -p -e "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 
9:9:0,g;" \
!               $(GCC_DIR)/libstdc++-v3/src/Makefile.am 
$(GCC_DIR)/libstdc++-v3/src/Makefile.in;
!       perl -i -p -e "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 
\
!               $(GCC_DIR)/libstdc++-v3/aclocal.m4 
$(GCC_DIR)/libstdc++-v3/configure;
        #
        # For now, we don't support locale-ified ctype (we will soon), 
--- 540,552 ----
  GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
  
! $(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched $(GMP_DIR)/.build 
$(MPFR_DIR)/.build
        #
        # Hack up the soname for libstdc++
        # 
! #     perl -i -p -e "s,SHLIB_SOVERSION = 1,SHLIB_SOVERSION = 0.9.9,g;" 
$(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
! #     perl -i -p -e "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 
9:9:0,g;" \
! #             $(GCC_DIR)/libstdc++-v3/src/Makefile.am 
$(GCC_DIR)/libstdc++-v3/src/Makefile.in;
! #     perl -i -p -e "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 
\
! #             $(GCC_DIR)/libstdc++-v3/aclocal.m4 
$(GCC_DIR)/libstdc++-v3/configure;
        #
        # For now, we don't support locale-ified ctype (we will soon), 
***************
*** 458,461 ****
--- 561,566 ----
        cp $(GCC_DIR)/libstdc++-v3/config/os/generic/ctype_noninline.h \
                $(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/
+       perl -i -p -e "s,wchar\.h,wchar-not-supported.h,g;" \
+               $(GCC_DIR)/libstdc++-v3/configure;
        touch $(GCC_DIR)/.g++_build_hacks
  
***************
*** 503,507 ****
            AR_FOR_TARGET=$(TARGET_CROSS)ar 
RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
            LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
!           CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) -C $(GCC_BUILD_DIR2) all
        touch $(GCC_BUILD_DIR2)/.compiled
  
--- 608,613 ----
            AR_FOR_TARGET=$(TARGET_CROSS)ar 
RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
            LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
!           CC_FOR_TARGET=$(TARGET_CROSS)gcc \
!           $(MAKE) $(MAKEOPTS) -C $(GCC_BUILD_DIR2) all
        touch $(GCC_BUILD_DIR2)/.compiled
  
***************
*** 559,563 ****
  
  ########################### bering uclibc stuff
! .source: .setup $(BINUTILS_DIR)/.patched $(UCLIBC_DIR)/.configured 
$(GCC_DIR)/.patched
        touch .source
  
--- 665,669 ----
  
  ########################### bering uclibc stuff
! .source: .setup $(BINUTILS_DIR)/.patched $(UCLIBC_DIR)/.configured 
$(GCC_DIR)/.patched $(GMP_DIR)/.unpacked $(MPFR_DIR)/.unpacked
        touch .source
  


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits

Reply via email to