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

chapter08/openssl.xml

@@ -26 +26 @@
     <para>The OpenSSL package contains  management tools and libraries relating
     to cryptography. These are useful for providing cryptographic functions
-    to other packages, such as OpenSSH, email applications and web browsers
+    to other packages, such as OpenSSH, email applications, and web browsers
     (for accessing HTTPS sites).  </para>
 
@@ -34 +34 @@
 
       <seglistitem>
-        <seg>&openssl-ch6-sbu;</seg>
-        <seg>&openssl-ch6-du;</seg>
+        <seg>&openssl-fin-sbu;</seg>
+        <seg>&openssl-fin-du;</seg>
       </seglistitem>
     </segmentedlist>
@@ -43 +43 @@
   <sect2 role="installation">
     <title>Installation of OpenSSL</title>
-<!--
-    <para>First, fix a problem identified upstream:</para>
-
-<screen><userinput remap="pre">sed -i '/\} data/s/ =.*$/;\n    memset(\&amp;data, 0, sizeof(data));/' \
-  crypto/rand/rand_lib.c</userinput></screen>
--->
+
     <para>Prepare OpenSSL for compilation:</para>
 
@@ -81 +76 @@
   </sect2>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI 32 ~~~~~~~~~~~~~~~~~~~~ -->
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - 32bit  -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_32,ml_all" role="installation">
-    <title>Installation of OpenSSL - 32-bit</title>
+    <title>Installation of OpenSSL - 32bit</title>
 
     <para>Clean previous build:</para>
@@ -97 +94 @@
     ./config               \
     --prefix=/usr          \
-    --libdir=/usr/lib32    \
-         --openssldir=/etc/ssl \
-         --libdir=lib32        \
-         shared                \
-         zlib-dynamic</userinput></screen>
+    --libdir=&usr-lib-m32;    \
+    --openssldir=/etc/ssl  \
+    --libdir=lib32         \
+    shared                 \
+    zlib-dynamic</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
+
     <para>Install the package:</para>
 
 <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>
-
-  <!-- ~~~~~~~~~~~~~~~~~~~~ ABI x32 ~~~~~~~~~~~~~~~~~~~~ -->
+  </sect2><!-- m32 -->
+
+  <!-- - - - - - - - - - -->
+  <!-- Multilib - x32bit -->
+  <!-- - - - - - - - - - -->
   
   <sect2 arch="ml_x32,ml_all" role="installation">
-    <title>Installation of OpenSSL - x32-bit</title>
+    <title>Installation of OpenSSL - x32bit</title>
 
     <para>Clean previous build:</para>
@@ -130 +130 @@
     ./config              \
     --prefix=/usr         \
-    --libdir=/usr/libx32  \
-         --openssldir=/etc/ssl \
-         --libdir=libx32       \
-         shared                \
-         zlib-dynamic</userinput></screen>
+    --libdir=&usr-lib-mx32;  \
+    --openssldir=/etc/ssl \
+    --libdir=libx32       \
+    shared                \
+    zlib-dynamic</userinput></screen>
 
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
+
     <para>Install the package:</para>
 
 <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-openssl" role="content">