Changeset 7753


Ignore:
Timestamp:
2007-06-28T09:30:25+02:00 (9 years ago)
Author:
nbd
Message:

replace gcc 4.2 snapshot with 4.2.0 release (sync patches with uclibc buildroot), adjust gcc makefile for PATCH_DIR changes

Location:
trunk/toolchain/gcc
Files:
4 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/toolchain/gcc/Config.in

    r6744 r7753  
    1515                bool "gcc 4.1.2" 
    1616 
    17         config GCC_VERSION_4_2 
     17        config GCC_VERSION_4_2_0 
    1818                depends !LINUX_2_4 
    19                 bool "gcc 4.2 (20060709)" 
     19                bool "gcc 4.2.0" 
    2020 
    2121endchoice 
  • trunk/toolchain/gcc/Config.version

    r6556 r7753  
    99        default "4.1.1"     if GCC_VERSION_4_1_1 
    1010        default "4.1.2"     if GCC_VERSION_4_1_2 
    11         default "4.2"           if GCC_VERSION_4_2 
     11        default "4.2.0"         if GCC_VERSION_4_2_0 
    1212        default "3.4.6-nonmips"     if GCC_VERSION_3_4_6_nonmips 
    1313        default "4.1.2" 
  • trunk/toolchain/gcc/Makefile

    r7531 r7753  
    2424PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#")) 
    2525 
    26 ifeq ($(PKG_VERSION),4.2) 
    27 PKG_VERSION:=20060709 
    28 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources 
    29 PATCH_DIR=./patches/4.2 
    30 else 
    3126PATCH_DIR=./patches/$(PKG_VERSION) 
    3227PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \ 
    3328        http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \ 
    3429        ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION) 
    35 endif 
    3630         
    3731PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2 
     
    123117define Build/Prepare 
    124118        $(call Build/Prepare/Default) 
    125         $(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) $(PATCH_DIR) \*.patch 
    126119        $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c 
    127120        $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c 
  • trunk/toolchain/gcc/patches/4.2.0/100-uclibc-conf.patch

    r5625 r7753  
    3636   ;; 
    3737  
    38 @@ -99523,7 +99523,7 @@ 
    39   
    40      case "$target" in 
    41        *-uclinux*) 
    42 -        # Don't enable LFS with uClibc 
    43 +        # Don't enable LFS with uClinux 
    44          ;; 
    45        *) 
    46          cat >>confdefs.h <<\_ACEOF 
    47 --- gcc/libstdc++-v3/crossconfig.m4 
    48 +++ gcc/libstdc++-v3/crossconfig.m4 
    49 @@ -161,7 +161,7 @@ 
    50      AC_DEFINE(HAVE_INT64_T) 
    51      case "$target" in 
    52        *-uclinux*) 
    53 -        # Don't enable LFS with uClibc 
    54 +        # Don't enable LFS with uClinux 
    55          ;; 
    56        *) 
    57          AC_DEFINE(_GLIBCXX_USE_LFS) 
    5838--- gcc/zlib/configure 
    5939+++ gcc/zlib/configure 
Note: See TracChangeset for help on using the changeset viewer.