Changeset 74592cf for BOOK/final-system/common/glibc.xml

Timestamp:

Aug 14, 2014, 2:32:50 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

c02c97a

Parents:

4b96748f

git-author:

Chris Staub <chris@…> (08/14/14 02:27:23)

git-committer:

Chris Staub <chris@…> (08/14/14 02:32:50)

Message:

Command to disable test lib is no longer needed

Conflicts:

BOOK/introduction/common/changelog.xml

File:

• BOOK/final-system/common/glibc.xml (modified) (2 diffs)

BOOK/final-system/common/glibc.xml

@@ -40 +40 @@
 
     <para os="l1">At the end of the installation, the build system will run
-    a sanity test to make sure everything installed properly. This script will
-    attempt to test for a library that is only used in the test suite and is
-    never installed. Prevent the script from testing for this library with the
-    following command:</para>
-
-<screen os="l2"><userinput>sed -i 's/\(&amp;&amp; $name ne\) "db1"/ &amp; \1 "nss_test1"/' scripts/test-installation.pl</userinput></screen>
-
-    <para os="l3">This same script performs its tests by attempting to compile
-    test programs against certain libraries. However it does not specify the
-    path to <filename class="libraryfile">ld.so</filename>, and our toolchain
+    a sanity test to make sure everything installed properly. This script
+    performs its tests by attempting to compile test programs against certain
+    libraries. However it does not specify the path to
+    <filename class="libraryfile">ld.so</filename>, and our toolchain
     is still configured to use the one in
     <filename class="directory">/tools</filename>. The following set of
@@ -55 +49 @@
     <filename class="libraryfile">ld.so</filename> that was just installed:</para>
 
-<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+<screen os="l2"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
 sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
   scripts/test-installation.pl