diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter05/binutils-pass1.xml | 3 | ||||
| -rw-r--r-- | chapter05/binutils-pass2.xml | 3 | ||||
| -rw-r--r-- | chapter06/binutils.xml | 5 | ||||
| -rw-r--r-- | chapter06/e2fsprogs.xml | 2 | ||||
| -rw-r--r-- | 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 @@ -40,6 +40,10 @@ <para>2011-11-25</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to Binutils-2.22. Fixes + <ulink url="&lfs-ticket-root;2967">#2967</ulink>.</para> + </listitem> + <listitem> <para>[matthew] - Install Glibc's NIS and RPC headers again. The headers have not been installed by default since Glibc-2.14, but that causes various BLFS packages to break. Fixes 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 @@ <!--<listitem> <para>Berkeley DB &db-version;</para> </listitem> --> - <!--<listitem> + <listitem> <para>Binutils &binutils-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Bison &bison-version;</para> </listitem>--> 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</userinput></screen> <para>Now prepare Binutils for compilation:</para> -<!-- <screen><userinput remap="configure">../binutils-&binutils-version;/configure \ --> -<screen><userinput remap="configure">../binutils-&binutils-dir;/configure \ +<screen><userinput remap="configure">../binutils-&binutils-version;/configure \ --target=$LFS_TGT --prefix=/tools \ --disable-nls --disable-werror</userinput></screen> 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</userinput></screen> <screen><userinput remap="configure">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</userinput></screen> -<!-- ../binutils-&binutils-version;/configure - -prefix=/tools \ --> <variablelist> <title>The meaning of the new configure options:</title> 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</userinput></screen> <para>Prepare Binutils for compilation:</para> -<!-- <screen><userinput remap="configure">../binutils-&binutils-version;/configure - -prefix=/usr \ --> -<screen><userinput remap="configure">../binutils-&binutils-dir;/configure --prefix=/usr --enable-shared</userinput></screen> +<screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr --enable-shared</userinput></screen> <para>Compile the package:</para> @@ -123,7 +122,7 @@ cd ../binutils-build</userinput></screen> file that is needed by some packages:</para> <!-- <screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> --> -<screen><userinput remap="install">cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen> +<screen><userinput remap="install">cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> </sect2> 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</userinput></screen> <para>Prepare E2fsprogs for compilation:</para> -<screen><userinput remap="configure">PKG_CONFIG=/tools/bin/true LDFLAGS=-lblkid \ +<screen><userinput remap="configure">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</userinput></screen> diff --git a/packages.ent b/packages.ent index dd827a1ff..e1ce041dd 100644 --- a/packages.ent +++ b/packages.ent @@ -34,11 +34,10 @@ <!ENTITY bash-ch6-du "35 MB"> <!ENTITY bash-ch6-sbu "1.4 SBU"> -<!ENTITY binutils-version "2.21.1a"> -<!ENTITY binutils-dir "2.21.1"> -<!ENTITY binutils-size "18,553 KB"> +<!ENTITY binutils-version "2.22"> +<!ENTITY binutils-size "19,505 KB"> <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2"> -<!ENTITY binutils-md5 "bde820eac53fa3a8d8696667418557ad"> +<!ENTITY binutils-md5 "ee0f10756c84979622b992a4a61ea3f5"> <!ENTITY binutils-home "http://www.gnu.org/software/binutils/"> <!ENTITY binutils-ch5p1-du "350 MB"> <!ENTITY binutils-ch5p1-sbu "1 SBU"> |