Added more essential NAS modules for NSLU2, NAS100d and DSMG600RevA profiles

[openwrt.git] / toolchain / gcc / Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index af06e8a..6d46f98 100644 (file)
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -23,11 +23,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gcc
 PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#"))
 
-PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=unknown
+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)
+       
+PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=unknown
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)
@@ -61,13 +63,14 @@ define Stage1/Configure
                --enable-target-optspace \
                --with-gnu-ld \
                --disable-nls \
+               --disable-libmudflap \
        );
 endef
 define Stage1/Compile
-       $(MAKE) -C $(BUILD_DIR1) all-gcc SHELL="$(BASH)"
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) all-gcc
 endef
 define Stage1/Install
-       $(MAKE) -C $(BUILD_DIR1) install-gcc SHELL="$(BASH)"
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR1) install-gcc
 endef
 
 define Stage2/Configure
@@ -90,13 +93,14 @@ define Stage2/Configure
                --enable-target-optspace \
                --with-gnu-ld \
                --disable-nls \
+               --disable-libmudflap \
        );
 endef
 define Stage2/Compile
-       $(MAKE) -C $(BUILD_DIR2) all SHELL="$(BASH)"
+       export SHELL="$(BASH)"; $(MAKE) -C $(BUILD_DIR2) all
 endef
 define Stage2/Install
-       $(MAKE) -C $(BUILD_DIR2) install SHELL="$(BASH)"
+       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; \
@@ -112,9 +116,10 @@ endef
 
 define Build/Prepare
        $(call Build/Prepare/Default)
-       $(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION) \*.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;);
+       $(SED) 's,gcc_no_link=yes,gcc_no_link=no,' $(PKG_BUILD_DIR)/libstdc++-v3/configure
 endef
 
 define Build/Configure