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

chapter08/libcap.xml

@@ -34 +34 @@
 
       <seglistitem>
-        <seg>&libcap-ch6-sbu;</seg>
-        <seg>&libcap-ch6-du;</seg>
+        <seg>&libcap-fin-sbu;</seg>
+        <seg>&libcap-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -80 +80 @@
   </sect2>
 
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
+  
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of Libcap - 32-bit</title>
+    <title>Installation of Libcap - 32bit</title>
 
     <para>Clean previous build:</para>
@@ -94 +98 @@
 
 <screen><userinput remap="install">make lib=lib32 prefix=$PWD/DESTDIR/usr -C libcap install
-cp -Rv DESTDIR/usr/lib32/* /usr/lib32
-chmod -v 755 /usr/lib32/libcap.so.&libcap-version;
+cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
+sed -e "s|^libdir=.*|libdir=&usr-lib-m32;|" -i &usr-lib-m32;/pkgconfig/lib{cap,psx}.pc
+chmod -v 755 &usr-lib-m32;/libcap.so.&libcap-version;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
-
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
+  
   <sect2 arch="ml_x32,ml_all" role="installation">
-    <title>Installation of Libcap - x32-bit</title>
+    <title>Installation of Libcap - x32bit</title>
 
     <para>Clean previous build:</para>
@@ -109 +118 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make CC="gcc -mx32"</userinput></screen>
+<screen><userinput remap="make">make CC="gcc -mx32 -march=x86-64"</userinput></screen>
 
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make lib=libx32 prefix=$PWD/DESTDIR/usr -C libcap install
-cp -Rv DESTDIR/usr/libx32/* /usr/libx32
-chmod -v 755 /usr/libx32/libcap.so.&libcap-version;
+cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
+sed -e "s|^libdir=.*|libdir=&usr-lib-mx32;|" -i &usr-lib-mx32;/pkgconfig/lib{cap,psx}.pc
+chmod -v 755 &usr-lib-mx32;/libcap.so.&libcap-version;
 rm -rf DESTDIR</userinput></screen>
 
-  </sect2>
+  </sect2><!-- mx32 -->
 
   <sect2 id="contents-libcap" role="content">