aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2011-11-25 20:50:58 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2011-11-25 20:50:58 +0000
commitac62f1701bc5e22cd4b16dd63e53af731a44ff4e (patch)
tree510b9add13727aa7db5ceaa8413f0a4f520a0c67 /chapter06
parent8e9135839af647026190ae32f3899d087f2f0084 (diff)
Upgrade to Binutils-2.22. Fixes #2967.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9671 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/binutils.xml5
-rw-r--r--chapter06/e2fsprogs.xml2
2 files changed, 3 insertions, 4 deletions
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>