diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f9fd5e597..f669191a7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,11 @@
[jhuntwork] - Remove ppc specific instructions from chapter 6 patch.
Cross-LFS can handle non-x86 arch specifics at this point.
+
+ [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.
+
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index c69710f50..be1ccec1d 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -55,7 +55,7 @@ not this add-on.
Unpack the tarball from within the Glibc source
directory:
-tar jxf ../glibc-libidn-&glibc-version;.tar.bz2
+tar -xf ../glibc-libidn-&glibc-version;.tar.bz2
In the vi_VN.TCVN locale, bash enters an infinite loop
at startup. It is unknown whether this is a bash bug or a
@@ -64,6 +64,17 @@ problem:
sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
+When running make install, a script called
+test-installation.pl performs a small sanity test
+on our newly installed Glibc. However, because our toolchain still points to the
+/tools 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:
+
+sed -i \
+'s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
+ scripts/test-installation.pl
+
The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:
@@ -267,7 +278,7 @@ mode.
-Configuring Dynamic Loader
+Configuring the Dynamic Loader
/etc/ld.so.conf
By default, the dynamic loader (