From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 Jan 2010 17:41:28 +0000 (+0100)
Subject: binutils: Buildfixes and add testsuite.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fba656caa9edef69ecef7efbc6d01eab7187d2f2;p=ipfire-3.x.git

binutils: Buildfixes and add testsuite.
---

diff --git a/pkgs/core/binutils/binutils.nm b/pkgs/core/binutils/binutils.nm
index 6039b2d8b..41790270a 100644
--- a/pkgs/core/binutils/binutils.nm
+++ b/pkgs/core/binutils/binutils.nm
@@ -55,12 +55,16 @@ PKG_PATCHES   += $(THISAPP)-asprintf_fix.patch
 
 define STAGE_PREPARE_CMDS
 	-mkdir -pv $(DIR_SRC)/binutils-build
+
+	# Suppress the installation of an outdated standards.info file as a newer
+	# one is installed later on in the Autoconf instructions:
+	cd $(DIR_APP) && rm -fv etc/standards.info
+	cd $(DIR_APP) && sed -e '/^INFO/s/standards.info //' -i etc/Makefile.in
 endef
 
 define STAGE_BUILD
 	cd $(DIR_SRC)/binutils-build && \
 		../$(THISAPP)/configure \
-			$(CONFIGURE_ARCH) \
 			--prefix=/usr \
 			--enable-shared \
 			--disable-nls \
@@ -70,6 +74,12 @@ define STAGE_BUILD
 	cd $(DIR_SRC)/binutils-build && make tooldir=/usr $(PARALLELISMFLAGS)
 endef
 
+define STAGE_TEST
+	# Apply a sed substitution to prevent a testsuite error:
+	cd $(DIR_APP) && sed -i 's/getline/get_line/' libiberty/testsuite/test-demangle.c
+	cd $(DIR_SRC)/binutils-build && make check
+endef
+
 define STAGE_INSTALL
 	cd $(DIR_SRC)/binutils-build && make tooldir=/usr install DESTDIR=$(BUILDROOT)