Changeset 6dfcfecc for chapter08/expat.xml

Timestamp:

03/31/2021 10:41:39 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

7610848

Parents:

811b5a39

git-author:

Thomas Trepl <thomas@…> (06/29/2020 07:55:01 AM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:39 AM)

Message:

Update to new lfs structure

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

File:

• chapter08/expat.xml (moved) (moved from chapter06/expat.xml ) (7 diffs)

chapter08/expat.xml

@@ -32 +32 @@
 
       <seglistitem>
-        <seg>&expat-ch6-sbu;</seg>
-        <seg>&expat-ch6-du;</seg>
+        <seg>&expat-fin-sbu;</seg>
+        <seg>&expat-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of Expat</title>
-
-    <para>First fix a problem with the regression tests in the LFS environment:</para>
-
-<screen><userinput remap="pre">sed -i 's|usr/bin/env |bin/|' run.sh.in</userinput></screen>
 
     <para>Prepare Expat for compilation:</para>
@@ -70 +66 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of Expat - 32-bit</title>
+    <title>Installation of Expat - 32bit</title>
 
     <para>Clean previous build but keep precompiled doc because it
@@ -85 +83 @@
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
     --prefix=/usr         \
-    --libdir=/usr/lib32   \
+    --libdir=&usr-lib-m32;  \
     --host=i686-pc-linux-gnu</userinput></screen>
 
@@ -95 +93 @@
 
 <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 Expat - x32-bit</title>
+    <title>Installation of Expat - x32bit</title>
 
-    <para>Clean previous build:</para>
+    <para>Clean previous build but keep precompiled doc because it
+    cannot be rebuilt in this stage of the system:</para>
 
 <screen><userinput remap="pre">sed -e "/^am__append_1/ s/doc//" -i Makefile
@@ -113 +114 @@
 
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
-    --prefix=/usr          \
-    --libdir=/usr/libx32   \
+    --prefix=/usr         \
+    --libdir=&usr-lib-mx32; \
     --host=x86_64-pc-linux-gnux32</userinput></screen>
 
@@ -124 +125 @@
 
 <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-expat" role="content">