Changeset ae437d3

Timestamp:

01/26/2006 02:35:40 AM (18 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

313ca76

Parents:

9c9c8e19

Message:

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/glibc.xml (modified) (3 diffs)

chapter01/changelog.xml

@@ -44 +44 @@
           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>

chapter06/glibc.xml

@@ -56 +56 @@
 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
@@ -64 +64 @@
 
 <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
@@ -268 +279 @@
 
 <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>