X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FMakefile;h=331809cf2b38bc987d482115f5109546fc9d2140;hp=423cec83c3e7acc22c70fbf6d0825489f4771b95;hb=970756c6d794dcf5fafd329e51013cc09b7c2ec4;hpb=8ca51dc6f10ae61e1d8ccc3a9763f574f41e272e

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 423cec83c3..331809cf2b 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006-2009 OpenWrt.org
+#
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -13,25 +13,23 @@ BIN_VERSION:=$(PKG_VERSION)
 PKG_SOURCE_URL:=@GNU/binutils/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-ifeq ($(PKG_VERSION),2.18)
-  PKG_MD5SUM:=9d22ee4dafa3a194457caf4706f9cf01
-endif
 ifeq ($(PKG_VERSION),2.19.1)
   PKG_MD5SUM:=09a8c5821a2dfdbb20665bc0bd680791
 endif
-ifeq ($(PKG_VERSION),2.19.1+cs)
-  BIN_VERSION:=20090205
-  PKG_SOURCE:=$(PKG_NAME)-$(BIN_VERSION).tar.bz2
-  PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-  PKG_MD5SUM:=040740e8c864dd1a15886753f9c0bc0b
-  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/binutils-$(BIN_VERSION)
-endif
-ifeq ($(PKG_VERSION),2.20)
-  PKG_MD5SUM:=ee2d3e996e9a2d669808713360fa96f8
-endif
 ifeq ($(PKG_VERSION),2.20.1)
   PKG_MD5SUM:=9cdfb9d6ec0578c166d3beae5e15c4e5
 endif
+ifeq ($(PKG_VERSION),2.21.1)
+  PKG_MD5SUM:=bde820eac53fa3a8d8696667418557ad
+endif
+ifeq ($(PKG_VERSION),2.22)
+  PKG_MD5SUM:=ee0f10756c84979622b992a4a61ea3f5
+endif
+ifeq ($(PKG_VERSION),2.23.1)
+  PKG_MD5SUM:=33adb18c3048d057ac58d07a3f1adb38
+endif
+
+HOST_BUILD_PARALLEL:=1
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
@@ -41,7 +39,7 @@ include $(INCLUDE_DIR)/toolchain-build.mk
 
 BINUTILS_CONFIGURE:= \
 	./configure \
-		--prefix=$(TOOLCHAIN_DIR)/usr \
+		--prefix=$(TOOLCHAIN_DIR) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
@@ -79,12 +77,17 @@ define Host/Configure
 endef
 
 define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) all
+	+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) all
 endef
 
 define Host/Install
-	$(MAKE) -C $(HOST_BUILD_DIR) install
-	$(CP) $(TOOLCHAIN_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
+	mkdir -p $(TOOLCHAIN_DIR)/initial
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		prefix=$(TOOLCHAIN_DIR)/initial \
+		install
+	$(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+	$(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
+	$(CP) $(TOOLCHAIN_DIR)/bin/$(REAL_GNU_TARGET_NAME)-readelf $(REAL_STAGING_DIR_HOST)/bin/readelf
 endef
 
 define Host/Clean