Changeset b2c61c6 for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

be00729f

Parents:

5066dee

git-author:

Thomas Trepl <thomas@…> (07/03/2019 05:47:21 AM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter06

Files:

• check.xml (modified) (2 diffs)
• libtool.xml (modified) (1 diff)
• openssl.xml (modified) (1 diff)

chapter06/check.xml

@@ -43 +43 @@
     <para>Prepare Check for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr \
-            --docdir=/usr/share/doc/check-&check-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
 
     <para>Build the package:</para>
@@ -60 +59 @@
     <para>Install the package and fix a script:</para>
 
-<screen><userinput remap="install">make install
+    <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install
 sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
 

chapter06/libtool.xml

@@ -51 +51 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 11.0 SBU), issue:</para>
+<para>To test the results<!--(about 11.0 SBU)-->, issue:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>

chapter06/openssl.xml

@@ -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>