Bläddra i källkod

Made the change to Glibc's test-installation.pl script architecture independent

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8292 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork 18 år sedan
förälder
incheckning
27a7dd9b67
3 ändrade filer med 17 tillägg och 5 borttagningar
  1. 10 0
      chapter01/changelog.xml
  2. 5 3
      chapter06/glibc.xml
  3. 2 2
      general.ent

+ 10 - 0
chapter01/changelog.xml

@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2007-08-08</para>
+      <itemizedlist>
+	<listitem>
+	  <para>[jhuntwork] - Make the sed to Glibc's test-installation.pl file
+	  architecture independent.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-08-07</para>
       <itemizedlist>

+ 5 - 3
chapter06/glibc.xml

@@ -78,9 +78,11 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
     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-x86-64.so.2 -o|' \
-        scripts/test-installation.pl</userinput></screen>
+<screen><userinput>DL=$(readelf -l /bin/sh | grep interpreter | \
+awk '{print $4}' | sed -e 's@/tools@@' -e 's@]$@@')
+sed -i &quot;s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$DL -o|&quot; \
+        scripts/test-installation.pl
+unset DL</userinput></screen>
 
     <para>The <command>ldd</command> shell script contains Bash-specific
     syntax. Change it's default program interpreter to <command>/bin/bash</command>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20070807">
-<!ENTITY releasedate "August 7, 2007">
+<!ENTITY version "SVN-JH-20070808">
+<!ENTITY releasedate "August 8, 2007">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->