aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Utley <jeremy@linuxfromscratch.org>2004-09-10 13:02:16 +0000
committerJeremy Utley <jeremy@linuxfromscratch.org>2004-09-10 13:02:16 +0000
commit6e8fc7d1996534dff1a06687e630c1f01aaf832f (patch)
treec70af451af8f3d22bd3a6e31f997d2ac4d83115f
parentb72295579dc15cdb2546b64f42fa184b63590fc6 (diff)
Resolved bug 895 with a modification to our glibc lockin instructions in chapter 6.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4150 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml6
-rw-r--r--chapter06/readjusting.xml3
-rw-r--r--general.ent4
3 files changed, 10 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 82e0e554f..4a8c0c301 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -93,6 +93,12 @@ first a summary, then a detailed log.</para>
</itemizedlist>
</listitem>
+<listitem><para>September 10th, 2004 [jeremy]: Modified the instructions to
+lock in glibc in Chapter 6, modifying the startfile_prefix_spec parameter in
+the gcc specs file. Thanks to Greg Schafer for pointing out this problem, and
+Ryan Oliver and Anderson Lizardo for the fix. Closes out bug 895 for
+unstable.</para></listitem>
+
<listitem><para>September 9th, 2004 [jeremy]: Added missing colon to group
name in Chapter 6-Coreutils (used by the test suite). Reported by
Nico to LFS-Dev</para></listitem>
diff --git a/chapter06/readjusting.xml b/chapter06/readjusting.xml
index c7ab66921..a3522a663 100644
--- a/chapter06/readjusting.xml
+++ b/chapter06/readjusting.xml
@@ -52,7 +52,8 @@ this:</para>
<!-- Ampersands are needed to allow cut and paste -->
-<screen><userinput>sed -i 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g' \
+<screen><userinput>perl -pi -e 's@ /tools/lib/ld-linux.so.2@ /lib/ld-linux.so.2@g;' \
+ -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/@g;' \
`gcc --print-file specs`</userinput></screen>
<para>Again, cutting and pasting the above is recommended. And just like
diff --git a/general.ent b/general.ent
index c7e0ffe13..278b06a13 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20040909">
-<!ENTITY releasedate "September 9, 2004">
+<!ENTITY version "SVN-20040910">
+<!ENTITY releasedate "September 10, 2004">
<!ENTITY milestone "6.1">
<!ENTITY lfs-root "http://www.linuxfromscratch.org/">