Changeset 6dfcfecc for chapter08/libelf.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/libelf.xml (moved) (moved from chapter06/libelf.xml ) (7 diffs)

chapter08/libelf.xml

@@ -32 +32 @@
 
       <seglistitem>
-        <seg>&elfutils-ch6-sbu;</seg>
-        <seg>&elfutils-ch6-du;</seg>
+        <seg>&elfutils-fin-sbu;</seg>
+        <seg>&elfutils-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -57 +57 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>One test, run-elfclassify.sh, is known to fail.</para>
+<!--    <para>One test, run-elfclassify.sh, is known to fail.</para>-->
 
     <para>Install only Libelf:</para>
@@ -67 +67 @@
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of Libelf - 32-bit</title>
+    <title>Installation of Libelf - 32bit</title>
 
     <para>Clean previous build:</para>
@@ -74 +78 @@
 <screen><userinput remap="pre">make distclean</userinput></screen>
 
-    <para>Prepare Libelf for compilation:</para>
+    <para>Prepare Libtool for compilation:</para>
 
 <screen><userinput remap="configure">CC="gcc -m32" ./configure \
-    --prefix=/usr         \
-    --libdir=/usr/lib32   \
+    --prefix=/usr            \
+    --libdir=&usr-lib-m32;     \
     --host=i686-pc-linux-gnu \
     --disable-debuginfod</userinput></screen>
@@ -89 +93 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
-install -vDm644 config/libelf.pc DESTDIR/usr/lib32/pkgconfig/libelf.pc
-cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+install -vDm644 config/libelf.pc DESTDIR&usr-lib-m32;/pkgconfig/libelf.pc
+cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- m32 -->
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
   <sect2 arch="ml_x32,ml_all" role="installation">
-    <title>Installation of Libelf - x32-bit</title>
+    <title>Installation of Libelf - x32bit</title>
 
     <para>Clean previous build:</para>
@@ -102 +110 @@
 <screen><userinput remap="pre">make distclean</userinput></screen>
 
-    <para>Prepare Libelf for compilation:</para>
+    <para>Prepare Libtool for compilation:</para>
 
 <screen><userinput remap="configure">CC="gcc -mx32" ./configure \
-    --prefix=/usr          \
-    --libdir=/usr/libx32   \
+    --prefix=/usr                 \
+    --libdir=&usr-lib-m32;           \
     --host=x86_64-pc-linux-gnux32 \
     --disable-debuginfod</userinput></screen>
@@ -117 +125 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR -C libelf install
-install -vDm644 config/libelf.pc DESTDIR/usr/libx32/pkgconfig/libelf.pc
-cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+install -vDm644 config/libelf.pc DESTDIR&usr-lib-mx32;/pkgconfig/libelf.pc
+cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- mx32 -->
 
   <sect2 id="contents-elfutils" role="content">