X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4134d3b68a6053d2923b175c51f38a771a295403..b3e588c735435c1cb5ee49de9fa6f63e04408111:/toolchain/gcc/Makefile

diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index af06e8a4c..d73580b5c 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -23,11 +23,19 @@ 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:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)
@@ -64,10 +72,10 @@ define Stage1/Configure
 	);
 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
@@ -93,10 +101,10 @@ define Stage2/Configure
 	);
 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 +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