webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

binutils: update to 2.18.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-08-17 16:35:21 +02:00
parent c7a2cfc817
commit 965018f4ff
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/common/binutils
View File

@@ -44,12 +44,12 @@
#usr/lib/ldscripts/i386linux.xn
#usr/lib/ldscripts/i386linux.xr
#usr/lib/ldscripts/i386linux.xu
#usr/lib/libbfd-2.17.so
#usr/lib/libbfd-2.18.so
#usr/lib/libbfd.a
#usr/lib/libbfd.la
#usr/lib/libbfd.so
#usr/lib/libiberty.a
#usr/lib/libopcodes-2.17.so
#usr/lib/libopcodes-2.18.so
#usr/lib/libopcodes.a
#usr/lib/libopcodes.la
#usr/lib/libopcodes.so
@@ -71,4 +71,5 @@
#usr/man/man1/size.1
#usr/man/man1/strings.1
#usr/man/man1/strip.1
#usr/man/man1/windmc.1
#usr/man/man1/windres.1

20
lfs/binutils
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.17
VER = 2.18
THISAPP = binutils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -34,23 +34,10 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
--build=$(MACHINE)-pc-linux-gnu \
--host=$(MACHINE)-pc-linux-gnu \
--target=$(MACHINE)-linux-uclibc \
--disable-nls \
--enable-multilib \
--disable-werror
EXTRA_MAKE = all
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --enable-shared --disable-nls
EXTRA_MAKE = tooldir=/usr
EXTRA_INSTALL = tooldir=/usr
endif
else
ifeq "$(PASS)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
@@ -73,7 +60,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e26e2e06b6e4bf3acf1dc8688a94c0d1
$(DL_FILE)_MD5 = 9d22ee4dafa3a194457caf4706f9cf01
install : $(TARGET)
@@ -104,6 +91,7 @@ $(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 && $(DIR_APP)/configure $(EXTRA_CONFIG)
ifeq "$(PASS)" "1"
cd $(DIR_SRC)/binutils-build && make configure-host
@@ -111,9 +99,7 @@ endif
cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
ifeq "$(ROOT)" ""
ifneq "$(LFS_PASS)" "install"
cp -v $(DIR_APP)/include/libiberty.h /usr/include
endif
else
ifeq "$(PASS)" "1"
cd $(DIR_SRC)/binutils-build && make -C ld clean

19
src/patches/binutils-2.18-configure-1.patch Normal file
View File

@@ -0,0 +1,19 @@
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"