소스 검색

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

Bruce Dubbs 16 년 전
부모
커밋
dc96e56c08
4개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 2
      chapter05/adjusting.xml
  2. 1 2
      chapter05/gcc-pass2.xml
  3. 4 2
      chapter06/glibc.xml
  4. 2 2
      prologue/hostreqs.xml

+ 1 - 2
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

+ 1 - 2
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

+ 4 - 2
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>

+ 2 - 2
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 &gt; version-check.sh &lt;&lt; "EOF"
 <literal>#!/bin/bash
 export LC_ALL=C