From 5ddb2ead5e4acb3f89739905305cde2429119717 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Tue, 2 Feb 2021 07:42:17 +0000
Subject: remove ch6 zlib, and workaround binutils issue

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12108 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/binutils-pass2.xml | 8 ++++++++
 chapter06/chapter06.xml      | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'chapter06')

diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml
index 438a5583b..9361c6717 100644
--- a/chapter06/binutils-pass2.xml
+++ b/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">
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 11bc5d499..366e9a8ab 100644
--- a/chapter06/chapter06.xml
+++ b/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"/>
-- 
cgit v1.2.3-54-g00ecf