revert gcc to 4.1.1 for x86 to fix uclibc++ build (closes: #1056, #1202)

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 77f7645..d73580b 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -23,14 +23,22 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gcc
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#"))
 
-PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=unknown
+ifeq ($(PKG_VERSION),4.2)
+PKG_VERSION:=20060709
+PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
+PATCH_DIR=./patches/4.2
+else
+PATCH_DIR=./patches/$(PKG_VERSION)
 PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \
        http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \
        ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
+endif
+       
+PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=unknown
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)
 
 TARGET_LANGUAGES:=c
 ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
@@ -42,13 +50,13 @@ endif
 
 include $(INCLUDE_DIR)/host-build.mk
 
-BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
-BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-final
-
+BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
+BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final
 
 define Stage1/Configure
        mkdir -p $(BUILD_DIR1)
        (cd $(BUILD_DIR1); rm -f config.cache; \
+               SHELL="$(BASH)" \
                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \
@@ -56,7 +64,7 @@ define Stage1/Configure
                --target=$(REAL_GNU_TARGET_NAME) \
                --enable-languages=c \
                --disable-shared \
-               --with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+               --with-sysroot=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
@@ -64,10 +72,10 @@ define Stage1/Configure
        );
 endef
 define Stage1/Compile
-       $(MAKE) -C $(BUILD_DIR1) all-gcc
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc
 endef
 define Stage1/Install
-       $(MAKE) -C $(BUILD_DIR1) install-gcc
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc
 endef
 
 define Stage2/Configure
@@ -78,6 +86,7 @@ define Stage2/Configure
        rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
        (cd $(BUILD_DIR2); rm -f config.cache; \
+               SHELL="$(BASH)" \
                $(PKG_BUILD_DIR)/configure \
                --prefix=$(STAGING_DIR) \
                --build=$(GNU_HOST_NAME) \
@@ -92,10 +101,10 @@ define Stage2/Configure
        );
 endef
 define Stage2/Compile
-       $(MAKE) -C $(BUILD_DIR2) all
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) all
 endef
 define Stage2/Install
-       $(MAKE) -C $(BUILD_DIR2) install
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) install
        echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
        # Set up the symlinks to enable lying about target name.
        set -e; \
@@ -111,9 +120,10 @@ endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
-       $(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION) \*.patch
+       $(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) $(PATCH_DIR) \*.patch
        $(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c
        $(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c
+       (cd $(PKG_BUILD_DIR)/libstdc++-v3; autoconf;);
 endef
 
 define Build/Configure