binutils: Update to 2.22.

This commit is contained in:
Michael Tremer
2012-08-06 22:02:45 +02:00
parent ca2b2688bf
commit 93cb6ff233
2 changed files with 2 additions and 22 deletions

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.18
VER = 2.22
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -71,7 +71,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
$(DL_FILE)_MD5 = ee0f10756c84979622b992a4a61ea3f5
install : $(TARGET)
@@ -102,7 +102,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/binutils-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/binutils-build
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-configure-1.patch
cd $(DIR_SRC)/binutils-build && MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
ifeq "$(PASS)" "1"
cd $(DIR_SRC)/binutils-build && make configure-host MAKEINFO=makeinfo MACHINE=

View File

@@ -1,19 +0,0 @@
Submitted By: Matt Burgess (matthew at linuxfromscratch dot org)
Date: 2007-11-19
Initial Package Version: 2.18
Origin: Upstream (http://sourceware.org/cgi-bin/cvsweb.cgi/src/configure.diff?r1=1.268&r2=1.268.2.1&cvsroot=src)
Upstream Status: Applied
Description: Fixes the configure script to correctly dictate Texinfo > 4.9.
diff -Naur binutils-2.18.orig/configure binutils-2.18/configure
--- binutils-2.18.orig/configure 2007-08-06 20:29:40.000000000 +0000
+++ binutils-2.18/configure 2007-11-18 22:37:58.000000000 +0000
@@ -6128,7 +6128,7 @@
# For an installed makeinfo, we require it to be from texinfo 4.4 or
# higher, else we use the "missing" dummy.
if ${MAKEINFO} --version \
- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
:
else
MAKEINFO="$MISSING makeinfo"