X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/94266d638908a140ef5cdd9b27d2eb367f97249f..9e77803ad6a4db02b16a6a2875794ab953b1050f:/toolchain/binutils/Makefile?ds=sidebyside

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 6d4f96f91..8682fa596 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -1,59 +1,53 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=binutils
-PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))#"))
+PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))
+#"))
 
-STABLE_SITE:=http://ftp.gnu.org/gnu/binutils/ \
+PKG_SOURCE_URL:=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/ 
 
-DEVEL_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
-
-ifeq ($(BINUTILS_VERSION),2.16.1)
-PKG_SOURCE_URL:=$(STABLE_SITE)
-else
-PKG_SOURCE_URL:=$(DEVEL_SITE)
-endif
-
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
-PKG_MD5SUM:=unknown
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_CAT:=bzcat
+PATCH_DIR:=./patches/$(PKG_VERSION)
+STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
+BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	if [ -d ./patches/$(PKG_VERSION) ]; then \
-		$(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION); \
-	fi
-endef
+EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
 
 define Build/Configure
+	$(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/
 	(cd $(PKG_BUILD_DIR); \
 		./configure \
-		--prefix=$(STAGING_DIR) \
+		--prefix=$(STAGING_DIR_HOST) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--disable-werror \
 		--disable-nls \
+		$(EXTRA_TARGET) \
+		$(SOFT_FLOAT_CONFIG_OPTION) \
+		$(call qstrip,$(CONFIG_EXTRA_BINUTILS_CONFIG_OPTIONS)) \
 	);
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) -j $(CONFIG_JLEVEL) all
+	$(MAKE) -C $(PKG_BUILD_DIR) all
 endef
 
 define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) -j $(CONFIG_JLEVEL) install
+	$(MAKE) -C $(PKG_BUILD_DIR) install
 endef
 
 $(eval $(call HostBuild))