Browse Source

Shorten the linker adjustment command in chapter 6. Fixes #2404.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8900 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 16 years ago
parent
commit
f32421a3b9
2 changed files with 6 additions and 2 deletions
  1. 5 0
      chapter01/changelog.xml
  2. 1 2
      chapter06/glibc.xml

+ 5 - 0
chapter01/changelog.xml

@@ -40,6 +40,11 @@
     <listitem>
     <listitem>
       <para>2009-05-23</para>
       <para>2009-05-23</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Shorten the command used to adjust the linker in
+          Chapter 6.  Thanks to Chris Staub for the improvement.  Fixes
+          <ulink url="&lfs-ticket-root;2404">#2404</ulink>.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[matthew] - Upgrade to Shadow-4.1.4.1.  Fixes
           <para>[matthew] - Upgrade to Shadow-4.1.4.1.  Fixes
           <ulink url="&lfs-ticket-root;2408">#2408</ulink>.</para>
           <ulink url="&lfs-ticket-root;2408">#2408</ulink>.</para>

+ 1 - 2
chapter06/glibc.xml

@@ -84,8 +84,7 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
     test would be carried out against the wrong Glibc. We can force the script
     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>
     to check the Glibc we have just installed with the following:</para>
 
 
-<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | grep interpreter | \
-awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@')
+<screen><userinput remap="pre">DL=$(readelf -l /bin/sh | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
 sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
         scripts/test-installation.pl
         scripts/test-installation.pl
 unset DL</userinput></screen>
 unset DL</userinput></screen>