X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=toolchain%2Fbinutils%2FMakefile;h=7073507dee81d76a4ce772a4012d19af22944409;hp=7d405664bb0fe398894e06a3b6a7aad192ebe732;hb=0aa409cc4d5952758e1576c2cdf0a71a626e5e96;hpb=02eae88c3599c13df02546694887b629e8892fd0

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 7d405664bb..7073507dee 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -1,106 +1,89 @@
-include $(TOPDIR)/rules.mk
-
-#############################################################
+# 
+# Copyright (C) 2006-2009 OpenWrt.org
 #
-# build binutils for use on the host system
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
-#############################################################
-BINUTILS_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
-#"
+include $(TOPDIR)/rules.mk
 
-BINUTILS_SITE:=http://www.fr.kernel.org/pub/linux/devel/binutils \
-	       http://www.fi.kernel.org/pub/linux/devel/binutils \
-	       http://ftp.kernel.org/pub/linux/devel/binutils \
-	       http://www.de.kernel.org/pub/linux/devel/binutils
+PKG_NAME:=binutils
+PKG_VERSION:=$(call qstrip,$(CONFIG_BINUTILS_VERSION))
+BIN_VERSION:=$(PKG_VERSION)
 
-BINUTILS_STABLE_SITE:=http://ftp.gnu.org/gnu/binutils/ \
-	ftp://gatekeeper.dec.com/pub/GNU/ \
-        ftp://ftp.uu.net/archive/systems/gnu/ \
-        ftp://ftp.eu.uu.net/pub/gnu/ \
-        ftp://ftp.funet.fi/pub/gnu/prep/ \
-        ftp://ftp.leo.org/pub/comp/os/unix/gnu/ 
+PKG_SOURCE_URL:=@GNU/binutils/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
-ifeq ($(BINUTILS_VERSION),2.16.1)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
+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
 
-BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2
-BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
-BINUTILS_CAT:=bzcat
-
-BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build
-
-$(DL_DIR)/$(BINUTILS_SOURCE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(BINUTILS_SOURCE) x $(BINUTILS_SITE)
+PATCH_DIR:=./patches/$(PKG_VERSION)
 
-$(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	$(BINUTILS_CAT) $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(BINUTILS_DIR)/.unpacked
+REAL_STAGING_DIR_HOST:=$(STAGING_DIR_HOST)
 
-$(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
-	# Apply appropriate binutils patches.
-	$(SCRIPT_DIR)/patch-kernel.sh $(BINUTILS_DIR) ./all \*.patch
-	$(SCRIPT_DIR)/patch-kernel.sh $(BINUTILS_DIR) ./$(BINUTILS_VERSION) \*.patch
-	touch $(BINUTILS_DIR)/.patched
+include $(INCLUDE_DIR)/toolchain-build.mk
 
-$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
-	mkdir -p $(BINUTILS_DIR1)
-	(cd $(BINUTILS_DIR1); \
-		$(BINUTILS_DIR)/configure \
-		--prefix=$(STAGING_DIR) \
+BINUTILS_CONFIGURE:= \
+	./configure \
+		--prefix=$(TOOLCHAIN_DIR)/usr \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
+		--with-sysroot=$(TOOLCHAIN_DIR) \
+		--disable-multilib \
 		--disable-werror \
-		$(DISABLE_NLS) \
-		$(MULTILIB) \
-		$(SOFT_FLOAT_CONFIG_OPTION) );
-	touch $(BINUTILS_DIR1)/.configured
-
-$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
-	$(MAKE) -C $(BINUTILS_DIR1) all
-
-# Make install will put gettext data in staging_dir/share/locale.
-# Unfortunatey, it isn't configureable.
-$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-ld: $(BINUTILS_DIR1)/binutils/objdump
-	$(MAKE) -C $(BINUTILS_DIR1) install
-
-
-#############################################################
-#
-# build binutils for use on the target system
-#
-#############################################################
-BINUTILS_DIR2:=$(BUILD_DIR)/binutils-$(BINUTILS_VERSION)-target
-$(BINUTILS_DIR2)/.configured: $(BINUTILS_DIR)/.patched
-	mkdir -p $(BINUTILS_DIR2)
-	(cd $(BINUTILS_DIR2); \
-		PATH=$(TARGET_PATH) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CFLAGS_FOR_BUILD="-O2 -g" \
-		$(BINUTILS_DIR)/configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--build=$(GNU_HOST_NAME) \
-		--host=$(REAL_GNU_TARGET_NAME) \
-		--target=$(REAL_GNU_TARGET_NAME) \
-		$(DISABLE_NLS) \
-		$(MULTILIB) \
-		$(SOFT_FLOAT_CONFIG_OPTION) );
-	touch $(BINUTILS_DIR2)/.configured
-
-$(BINUTILS_DIR2)/binutils/objdump: $(BINUTILS_DIR2)/.configured
-	PATH=$(TARGET_PATH) \
-	$(MAKE) -C $(BINUTILS_DIR2) all
-
-source: $(DL_DIR)/$(BINUTILS_SOURCE)
-prepare: $(BINUTILS_DIR)/.patched
-compile: $(BINUTILS_DIR1)/binutils/objdump
-install: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-ld
-clean:
-	rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)*
-	rm -rf $(BINUTILS_DIR) $(BINUTILS_DIR1)
+		--disable-nls \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) \
+
+ifneq ($(CONFIG_SSP_SUPPORT),)
+  BINUTILS_CONFIGURE+= \
+		--enable-libssp
+else
+  BINUTILS_CONFIGURE+= \
+		--disable-libssp
+endif
 
+ifneq ($(CONFIG_EXTRA_TARGET_ARCH),)
+  BINUTILS_CONFIGURE+= \
+		--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-$(TARGET_SUFFIX)
+endif
 
+define Host/Prepare
+	$(call Host/Prepare/Default)
+	ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/
+endef
+
+define Host/Configure
+	(cd $(HOST_BUILD_DIR); \
+		$(BINUTILS_CONFIGURE) \
+	);
+endef
+
+define Host/Compile
+	$(MAKE) -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
+endef
+
+define Host/Clean
+	rm -rf \
+		$(HOST_BUILD_DIR) \
+		$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
+endef
+
+$(eval $(call HostBuild))