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

chapter08/libffi.xml

@@ -33 +33 @@
 
       <seglistitem>
-        <seg>&libffi-ch6-sbu;</seg>
-        <seg>&libffi-ch6-du;</seg>
+        <seg>&libffi-fin-sbu;</seg>
+        <seg>&libffi-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -50 +50 @@
       Illegal Operation Errors.</para>
     </note>
-<!--
-    <para>Modify the Makefile to install headers into the standard
-    <filename class="directory">/usr/include</filename> directory instead of
-    <filename class="directory">/usr/lib/libffi-&libffi-version;/include</filename>.</para>
 
-<screen><userinput remap="pre">sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
-    -i include/Makefile.in
-
-sed -e '/^includedir/ s/=.*$/=@includedir@/' \
-    -e 's/^Cflags: -I${includedir}/Cflags:/' \
-    -i libffi.pc.in</userinput></screen>
--->
     <para>Prepare libffi for compilation:</para>
 
@@ -72 +61 @@
         <term><parameter>--with-gcc-arch=native</parameter></term>
         <listitem>
-          <para>Ensure gcc optimizes for the current system.  If this
+          <para>Ensure GCC optimizes for the current system.  If this
           is not specified, the system is guessed and the code generated
           may not be correct for some systems.  If the generated code
@@ -79 +68 @@
           about alternative system types, see <ulink 
           url='https://gcc.gnu.org/onlinedocs/gcc-&gcc-version;/gcc/x86-Options.html'>
-          the x86 options in the gcc manual</ulink>.</para>
+          the x86 options in the GCC manual</ulink>.</para>
         </listitem>
       </varlistentry>
@@ -93 +82 @@
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>Six tests, all related to test-callback.c, are known to fail.</para>
-
     <para>Install the package:</para>
 
@@ -101 +88 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of Libffi - 32-bit</title>
+    <title>Installation of Libffi - 32bit</title>
 
     <para>Clean previous build:</para>
@@ -112 +101 @@
     <para>Prepare Libffi for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -m32" CXX="g++ -m32" \
-./configure                  \
+<screen><userinput remap="configure">CC="gcc -m32" CXX="g++ -m32" ./configure \
     --prefix=/usr            \
     --disable-static         \
-    --libdir=/usr/lib32      \
+    --libdir=&usr-lib-m32;     \
     --with-gcc-arch=i686     \
     --host=i686-pc-linux-gnu</userinput></screen>
@@ -131 +119 @@
 
 <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 Libffi - x32-bit</title>
+    <title>Installation of Libtool - x32bit</title>
 
     <para>Clean previous build:</para>
@@ -147 +137 @@
     <para>Prepare Libffi for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -mx32" CXX="g++ -mx32" \
-./configure                    \
-    --prefix=/usr              \
-    --disable-static           \
-    --with-gcc-arch=x86_64     \
-    --libdir=/usr/libx32       \
+<screen><userinput remap="configure">CC="gcc -mx32" CXX="g++ -mx32" ./configure \
+    --prefix=/usr            \
+    --disable-static         \
+    --libdir=&usr-lib-mx32;     \
+    --with-gcc-arch=x86_64   \
     --host=x86_64-unknown-linux-gnux32</userinput></screen>
 
@@ -166 +155 @@
 
 <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-libffi" role="content">