Pārlūkot izejas kodu

remove ch6 zlib, and workaround binutils issue

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12108 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Xi Ruoyao 3 gadi atpakaļ
vecāks
revīzija
5ddb2ead5e
2 mainītis faili ar 9 papildinājumiem un 1 dzēšanām
  1. 8 0
      chapter06/binutils-pass2.xml
  2. 1 1
      chapter06/chapter06.xml

+ 8 - 0
chapter06/binutils-pass2.xml

@@ -89,6 +89,14 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
+    <para>
+      Workaround an issue causing
+      <filename class="libraryfile">libctf.so</filename>
+      to link against zlib from the host distribution:
+    </para>
+
+<screen><userinput remap="install">install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">

+ 1 - 1
chapter06/chapter06.xml

@@ -22,7 +22,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
+  <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>