From ac62f1701bc5e22cd4b16dd63e53af731a44ff4e Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Fri, 25 Nov 2011 20:50:58 +0000 Subject: [PATCH] Upgrade to Binutils-2.22. Fixes #2967. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9671 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 4 ++++ chapter01/whatsnew.xml | 4 ++-- chapter05/binutils-pass1.xml | 3 +-- chapter05/binutils-pass2.xml | 3 +-- chapter06/binutils.xml | 5 ++--- chapter06/e2fsprogs.xml | 2 +- packages.ent | 7 +++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index edb9426cf..7453f6240 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2011-11-25 + + [matthew] - Upgrade to Binutils-2.22. Fixes + #2967. + [matthew] - Install Glibc's NIS and RPC headers again. The headers have not been installed by default since Glibc-2.14, but that diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 82555b44c..67ee2951e 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -43,9 +43,9 @@ - + diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index bd35c67ff..ca8e5b8f7 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -72,8 +72,7 @@ cd ../binutils-build Now prepare Binutils for compilation: - -../binutils-&binutils-dir;/configure \ +../binutils-&binutils-version;/configure \ --target=$LFS_TGT --prefix=/tools \ --disable-nls --disable-werror diff --git a/chapter05/binutils-pass2.xml b/chapter05/binutils-pass2.xml index 148e3b6cf..f3fe914bb 100644 --- a/chapter05/binutils-pass2.xml +++ b/chapter05/binutils-pass2.xml @@ -52,10 +52,9 @@ cd ../binutils-build CC="$LFS_TGT-gcc -B/tools/lib/" \ AR=$LFS_TGT-ar RANLIB=$LFS_TGT-ranlib \ - ../binutils-&binutils-dir;/configure --prefix=/tools \ + ../binutils-&binutils-version;/configure --prefix=/tools \ --disable-nls --with-lib-path=/tools/lib - The meaning of the new configure options: diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml index ecf747e89..23e2b98bb 100644 --- a/chapter06/binutils.xml +++ b/chapter06/binutils.xml @@ -77,8 +77,7 @@ cd ../binutils-build Prepare Binutils for compilation: - -../binutils-&binutils-dir;/configure --prefix=/usr --enable-shared +../binutils-&binutils-version;/configure --prefix=/usr --enable-shared Compile the package: @@ -123,7 +122,7 @@ cd ../binutils-build file that is needed by some packages: -cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include +cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index 09a04642d..ceb90c3be 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -52,7 +52,7 @@ cd build Prepare E2fsprogs for compilation: -PKG_CONFIG=/tools/bin/true LDFLAGS=-lblkid \ +PKG_CONFIG=/tools/bin/true LDFLAGS="-lblkid -luuid" \ ../configure --prefix=/usr --with-root-prefix="" \ --enable-elf-shlibs --disable-libblkid --disable-libuuid \ --disable-uuidd --disable-fsck diff --git a/packages.ent b/packages.ent index dd827a1ff..e1ce041dd 100644 --- a/packages.ent +++ b/packages.ent @@ -34,11 +34,10 @@ - - - + + - +