massive cleanup of toolchain/

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4038 3c298f89-4303-0410-b956-a3cf2f4a3e73

34 files changed, 35 insertions, 81 deletions

diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index c161370e9..6d4f96f91 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -1,105 +1,59 @@
 include $(TOPDIR)/rules.mk
 
-#############################################################
-#
-# build binutils for use on the host system
-#
-#############################################################
-BINUTILS_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))#"))
+PKG_NAME:=binutils
+PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION)))#"))
 
-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
-
-BINUTILS_STABLE_SITE:=http://ftp.gnu.org/gnu/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/ 
 
+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)
-BINUTILS_SITE:=$(BINUTILS_STABLE_SITE)
+PKG_SOURCE_URL:=$(STABLE_SITE)
+else
+PKG_SOURCE_URL:=$(DEVEL_SITE)
 endif
 
-BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2
-BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)
-BINUTILS_CAT:=bzcat
+PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=unknown
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_CAT:=bzcat
 
-BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build
+include $(INCLUDE_DIR)/host-build.mk
 
-$(DL_DIR)/$(BINUTILS_SOURCE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(BINUTILS_SOURCE) x $(BINUTILS_SITE)
 
-$(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
+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
 
-$(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
-
-$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
-	mkdir -p $(BINUTILS_DIR1)
-	(cd $(BINUTILS_DIR1); \
-		$(BINUTILS_DIR)/configure \
+define Build/Configure
+	(cd $(PKG_BUILD_DIR); \
+		./configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--disable-werror \
-		$(DISABLE_NLS) \
-		$(MULTILIB) \
-		$(SOFT_FLOAT_CONFIG_OPTION) );
-	touch $(BINUTILS_DIR1)/.configured
-
-$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
-	$(MAKE) -C $(BINUTILS_DIR1) -j $(CONFIG_JLEVEL) 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) -j $(CONFIG_JLEVEL) 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) -j $(CONFIG_JLEVEL) all
+		--disable-nls \
+	);
+endef
 
-source: $(DL_DIR)/$(BINUTILS_SOURCE)
-prepare: $(BINUTILS_DIR)/.patched
-compile: $(BINUTILS_DIR1)/binutils/objdump
-install: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-ld
-clean: FORCE
-	rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)*
-	rm -rf $(BINUTILS_DIR) $(BINUTILS_DIR1)
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) -j $(CONFIG_JLEVEL) all
+endef
 
+define Build/Install
+	$(MAKE) -C $(PKG_BUILD_DIR) -j $(CONFIG_JLEVEL) install
+endef
 
+$(eval $(call HostBuild))
diff --git a/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch b/toolchain/binutils/patches/2.15.94.0.2/100-uclibc-conf.patch
index dc21386f4..dc21386f4 100644
--- a/toolchain/binutils/2.15.94.0.2/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.15.94.0.2/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.15.94.0.2/300-001_ld_makefile_patch.patch
index b25d5b7e2..b25d5b7e2 100644
--- a/toolchain/binutils/2.15.94.0.2/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.15.94.0.2/300-006_better_file_error.patch b/toolchain/binutils/patches/2.15.94.0.2/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.15.94.0.2/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.15.94.0.2/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.15.94.0.2/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.15.94.0.2/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.15.94.0.2/300-120_mips_xgot_multigot_workaround.patch b/toolchain/binutils/patches/2.15.94.0.2/300-120_mips_xgot_multigot_workaround.patch
index ae2033d06..ae2033d06 100644
--- a/toolchain/binutils/2.15.94.0.2/300-120_mips_xgot_multigot_workaround.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/300-120_mips_xgot_multigot_workaround.patch
diff --git a/toolchain/binutils/2.15.94.0.2/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.15.94.0.2/702-binutils-skip-comments.patch
index 804a17e00..804a17e00 100644
--- a/toolchain/binutils/2.15.94.0.2/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.15.94.0.2/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/2.16.1/100-uclibc-conf.patch b/toolchain/binutils/patches/2.16.1/100-uclibc-conf.patch
index 7c0a72693..7c0a72693 100644
--- a/toolchain/binutils/2.16.1/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.16.1/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.16.1/110-uclibc-libtool-conf.patch b/toolchain/binutils/patches/2.16.1/110-uclibc-libtool-conf.patch
index ec38caa12..ec38caa12 100644
--- a/toolchain/binutils/2.16.1/110-uclibc-libtool-conf.patch
+++ b/toolchain/binutils/patches/2.16.1/110-uclibc-libtool-conf.patch
diff --git a/toolchain/binutils/2.16.1/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.16.1/300-001_ld_makefile_patch.patch
index b25d5b7e2..b25d5b7e2 100644
--- a/toolchain/binutils/2.16.1/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.16.1/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.16.1/300-006_better_file_error.patch b/toolchain/binutils/patches/2.16.1/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.16.1/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.16.1/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.16.1/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.16.1/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.16.1/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.16.1/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.16.1/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.16.1/702-binutils-skip-comments.patch
index 9ef7a7c9e..9ef7a7c9e 100644
--- a/toolchain/binutils/2.16.1/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.16.1/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/2.16.90.0.3/100-uclibc-conf.patch b/toolchain/binutils/patches/2.16.90.0.3/100-uclibc-conf.patch
index c7e2c63ef..c7e2c63ef 100644
--- a/toolchain/binutils/2.16.90.0.3/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.16.90.0.3/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.16.90.0.3/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.16.90.0.3/300-001_ld_makefile_patch.patch
index b25d5b7e2..b25d5b7e2 100644
--- a/toolchain/binutils/2.16.90.0.3/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.16.90.0.3/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.16.90.0.3/300-006_better_file_error.patch b/toolchain/binutils/patches/2.16.90.0.3/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.16.90.0.3/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.16.90.0.3/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.16.90.0.3/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.16.90.0.3/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.16.90.0.3/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.16.90.0.3/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.16.90.0.3/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.16.90.0.3/702-binutils-skip-comments.patch
index 9ef7a7c9e..9ef7a7c9e 100644
--- a/toolchain/binutils/2.16.90.0.3/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.16.90.0.3/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/2.16.91.0.1/100-uclibc-conf.patch b/toolchain/binutils/patches/2.16.91.0.1/100-uclibc-conf.patch
index c7e2c63ef..c7e2c63ef 100644
--- a/toolchain/binutils/2.16.91.0.1/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.16.91.0.1/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.16.91.0.1/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.16.91.0.1/300-001_ld_makefile_patch.patch
index 04a7e61e2..04a7e61e2 100644
--- a/toolchain/binutils/2.16.91.0.1/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.16.91.0.1/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.16.91.0.1/300-006_better_file_error.patch b/toolchain/binutils/patches/2.16.91.0.1/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.16.91.0.1/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.16.91.0.1/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.16.91.0.1/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.16.91.0.1/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.16.91.0.1/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.16.91.0.1/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.16.91.0.1/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.16.91.0.1/702-binutils-skip-comments.patch
index 9ef7a7c9e..9ef7a7c9e 100644
--- a/toolchain/binutils/2.16.91.0.1/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.16.91.0.1/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/2.16.91.0.2/100-uclibc-conf.patch b/toolchain/binutils/patches/2.16.91.0.2/100-uclibc-conf.patch
index 85fc30930..85fc30930 100644
--- a/toolchain/binutils/2.16.91.0.2/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.16.91.0.2/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.16.91.0.2/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.16.91.0.2/300-001_ld_makefile_patch.patch
index 04a7e61e2..04a7e61e2 100644
--- a/toolchain/binutils/2.16.91.0.2/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.16.91.0.2/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.16.91.0.2/300-006_better_file_error.patch b/toolchain/binutils/patches/2.16.91.0.2/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.16.91.0.2/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.16.91.0.2/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.16.91.0.2/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.16.91.0.2/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.16.91.0.2/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.16.91.0.2/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.16.91.0.2/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.16.91.0.2/702-binutils-skip-comments.patch
index 9ef7a7c9e..9ef7a7c9e 100644
--- a/toolchain/binutils/2.16.91.0.2/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.16.91.0.2/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/2.16.91.0.6/100-uclibc-conf.patch b/toolchain/binutils/patches/2.16.91.0.6/100-uclibc-conf.patch
index 4c72f330f..4c72f330f 100644
--- a/toolchain/binutils/2.16.91.0.6/100-uclibc-conf.patch
+++ b/toolchain/binutils/patches/2.16.91.0.6/100-uclibc-conf.patch
diff --git a/toolchain/binutils/2.16.91.0.6/300-001_ld_makefile_patch.patch b/toolchain/binutils/patches/2.16.91.0.6/300-001_ld_makefile_patch.patch
index 04a7e61e2..04a7e61e2 100644
--- a/toolchain/binutils/2.16.91.0.6/300-001_ld_makefile_patch.patch
+++ b/toolchain/binutils/patches/2.16.91.0.6/300-001_ld_makefile_patch.patch
diff --git a/toolchain/binutils/2.16.91.0.6/300-006_better_file_error.patch b/toolchain/binutils/patches/2.16.91.0.6/300-006_better_file_error.patch
index f337611ed..f337611ed 100644
--- a/toolchain/binutils/2.16.91.0.6/300-006_better_file_error.patch
+++ b/toolchain/binutils/patches/2.16.91.0.6/300-006_better_file_error.patch
diff --git a/toolchain/binutils/2.16.91.0.6/300-012_check_ldrunpath_length.patch b/toolchain/binutils/patches/2.16.91.0.6/300-012_check_ldrunpath_length.patch
index 498651a90..498651a90 100644
--- a/toolchain/binutils/2.16.91.0.6/300-012_check_ldrunpath_length.patch
+++ b/toolchain/binutils/patches/2.16.91.0.6/300-012_check_ldrunpath_length.patch
diff --git a/toolchain/binutils/2.16.91.0.6/702-binutils-skip-comments.patch b/toolchain/binutils/patches/2.16.91.0.6/702-binutils-skip-comments.patch
index 9ef7a7c9e..9ef7a7c9e 100644
--- a/toolchain/binutils/2.16.91.0.6/702-binutils-skip-comments.patch
+++ b/toolchain/binutils/patches/2.16.91.0.6/702-binutils-skip-comments.patch
diff --git a/toolchain/binutils/all/400-mips-ELF_MAXPAGESIZE-4k.patch b/toolchain/binutils/patches/400-mips-ELF_MAXPAGESIZE-4k.patch
index a8ae110e8..a8ae110e8 100644
--- a/toolchain/binutils/all/400-mips-ELF_MAXPAGESIZE-4k.patch
+++ b/toolchain/binutils/patches/400-mips-ELF_MAXPAGESIZE-4k.patch