Changeset 37e35d2 for chapter08/zlib.xml

Timestamp:

06/29/2020 07:55:01 AM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

c4804e8

Parents:

d4fdde6

Message:

Update to new lfs structure

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11986 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter08/zlib.xml (moved) (moved from chapter06/zlib.xml ) (6 diffs)

chapter08/zlib.xml

@@ -32 +32 @@
 
       <seglistitem>
-        <seg>&zlib-ch6-sbu;</seg>
-        <seg>&zlib-ch6-du;</seg>
+        <seg>&zlib-fin-sbu;</seg>
+        <seg>&zlib-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -68 +68 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
-  
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of Zlib - 32-bit</title>
+    <title>Installation of Zlib - 32bit</title>
 
     <para>Clean previous build:</para>
@@ -79 +81 @@
     <para>Prepare Zlib for compilation:</para>
 
-<!-- configure doesn't know option - -host=i686-pc-linux-gnu --> 
-<screen><userinput remap="configure">CC="gcc -m32 -march=i686" \
+<screen><userinput remap="configure">CC="gcc -m32" \
 ./configure --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
+    --libdir=&usr-lib-m32;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -91 +92 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- m32 -->
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
-  
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+
   <sect2 arch="ml_x32,ml_all" role="installation">
-    <title>Installation of Zlib - x32-bit</title>
+    <title>Installation of Zlib - x32bit</title>
 
 <screen><userinput remap="pre">make distclean</userinput></screen>
@@ -107 +110 @@
 <screen><userinput remap="configure">CC="gcc -mx32" \
 ./configure --prefix=/usr    \
-    --libdir=/usr/libx32</userinput></screen>
+    --libdir=&usr-lib-mx32;</userinput></screen>
 
     <para>Compile the package:</para>
@@ -116 +119 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- mx32 -->
 
   <sect2 id="contents-zlib" role="content">