diff options
author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2009-07-12 16:48:19 +0000 |
---|---|---|
committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2009-07-12 16:48:19 +0000 |
commit | dc96e56c08516c684864e0df3ee002f85f055068 (patch) | |
tree | bd01323cefc935b0eea288412673ba77bf7ffa2f | |
parent | 4982b58204393c3a31a6bc3f466e1519aec92c72 (diff) |
Change output if readelf to render on one line like the actual output.
Update formatting for pdf.
This is appearance only and did not change version number.
Fixes Ticket #2438.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8958 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r-- | chapter05/adjusting.xml | 3 | ||||
-rw-r--r-- | chapter05/gcc-pass2.xml | 3 | ||||
-rw-r--r-- | chapter06/glibc.xml | 6 | ||||
-rw-r--r-- | prologue/hostreqs.xml | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/chapter05/adjusting.xml b/chapter05/adjusting.xml index dc02f05e5..7372e4cdd 100644 --- a/chapter05/adjusting.xml +++ b/chapter05/adjusting.xml @@ -52,8 +52,7 @@ readelf -l a.out | grep ': /tools'</userinput></screen> <para>If everything is working correctly, there should be no errors, and the output of the last command will be of the form:</para> -<screen><computeroutput>[Requesting program interpreter: - /tools/lib/ld-linux.so.2]</computeroutput></screen> +<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen> <para>Note that <filename class="directory">/tools/lib</filename>, or <filename class="directory">/tools/lib64</filename> for 64-bit machines diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 3db93f0d6..8d8608c63 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -252,8 +252,7 @@ readelf -l a.out | grep ': /tools'</userinput></screen> <para>If everything is working correctly, there should be no errors, and the output of the last command will be of the form:</para> -<screen><computeroutput>[Requesting program interpreter: - /tools/lib/ld-linux.so.2]</computeroutput></screen> +<screen><computeroutput>[Requesting program interpreter: /tools/lib/ld-linux.so.2]</computeroutput></screen> <para>Note that <filename class="directory">/tools/lib</filename>, or <filename class="directory">/tools/lib64</filename> for 64-bit machines diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index 9aee47585..f88922be7 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -113,8 +113,10 @@ tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata' libio/Makefile</userinput>< <para>Fix an error in the constants that get passed to the futex system call in some cases, causing certain pthread_mutex operations to fail:</para> -<screen><userinput remap="pre">sed -i -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ - nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen> +<!-- Format below is for proper pdf generation --> +<screen><userinput remap="pre">sed -i \ + -e 's/FUTEX_WAIT\( | FUTEX_CLOCK_REALTIME, reg\)/FUTEX_WAIT_BITSET\1/' \ + nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S</userinput></screen> <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> diff --git a/prologue/hostreqs.xml b/prologue/hostreqs.xml index c6fd1868e..3aa6fd4e5 100644 --- a/prologue/hostreqs.xml +++ b/prologue/hostreqs.xml @@ -151,10 +151,10 @@ deviation from the instructions or additional patches to some packages.</para> - <para>To see whether your host system has all the appropriate versions, and + <para id="version-check">To see whether your host system has all the appropriate versions, and the ability to compile programs, run the following:</para> -<anchor xreflabel="Version Check Script" id="version-check"/> +<!--<anchor xreflabel="Version Check Script" id="version-check"/>--> <screen role="nodump"><userinput>cat > version-check.sh << "EOF" <literal>#!/bin/bash export LC_ALL=C |