Преглед на файлове

Fix chapter 6 Glibc's test-installation.pl to test the correct Glibc.
Fixes bug 1675. Thanks to Dan Nicholson for the report and Greg Schafer for the fix.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7305 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Jeremy Huntwork преди 19 години
родител
ревизия
ae437d3255
променени са 2 файла, в които са добавени 18 реда и са изтрити 2 реда
  1. 5 0
      chapter01/changelog.xml
  2. 13 2
      chapter06/glibc.xml

+ 5 - 0
chapter01/changelog.xml

@@ -43,6 +43,11 @@
           <para>[jhuntwork] - Remove ppc specific instructions from chapter 6 patch.
 	  Cross-LFS can handle non-x86 arch specifics at this point.</para>
         </listitem>
+	<listitem>
+	  <para>[jhuntwork] - Fix chapter 6 Glibc's test-installation.pl to test
+	  the correct Glibc. Fixes bug 1675. Thanks to Dan Nicholson for the report
+	  and Greg Schafer for the fix.</para>
+	</listitem>
       </itemizedlist>
     </listitem>
 

+ 13 - 2
chapter06/glibc.xml

@@ -55,7 +55,7 @@ not this add-on.
 Unpack the tarball from within the Glibc source
 directory:</para>
 
-<screen><userinput>tar jxf ../glibc-libidn-&glibc-version;.tar.bz2</userinput></screen>
+<screen><userinput>tar -xf ../glibc-libidn-&glibc-version;.tar.bz2</userinput></screen>
 
 <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
 at startup. It is unknown whether this is a <command>bash</command> bug or a
@@ -64,6 +64,17 @@ problem:</para>
 
 <screen><userinput>sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
 
+<para>When running <command>make install</command>, a script called
+<filename>test-installation.pl</filename> performs a small sanity test
+on our newly installed Glibc. However, because our toolchain still points to the
+<filename class="directory">/tools</filename> directory, the sanity test would
+be carried out against the wrong Glibc. We can force the script to check the
+Glibc we have just installed with the following:</para>
+
+<screen><userinput>sed -i \
+'s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
+        scripts/test-installation.pl</userinput></screen>
+
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
@@ -267,7 +278,7 @@ mode.</para></listitem>
 
 
 <sect2 id="conf-ld" role="configuration">
-<title>Configuring Dynamic Loader</title>
+<title>Configuring the Dynamic Loader</title>
 <indexterm zone="conf-ld"><primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary></indexterm>
 
 <para>By default, the dynamic loader (<filename