Changeset d7f58cc for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

0aaf6a31

Parents:

1daca67

git-author:

Thomas Trepl <thomas@…> (09/17/2019 06:43:09 AM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter06

Files:

• bison.xml (modified) (1 diff)
• findutils.xml (modified) (2 diffs)
• glibc.xml (modified) (1 diff)
• openssl.xml (modified) (2 diffs)

chapter06/bison.xml

@@ -43 +43 @@
     <para>First, fix a build problem with the current version:</para>
 
-<screen><userinput remap="pre">sed -i '6855 s/mv/cp/' Makefile.in</userinput></screen>
+<screen><userinput remap="pre">sed -i '9327 s/mv/cp/' Makefile.in</userinput></screen>
 
     <para>Prepare Bison for compilation:</para>

chapter06/findutils.xml

@@ -44 +44 @@
     <title>Installation of Findutils</title>
 
-   <!-- this has been fixed in upstream gnulib, when a new version of
-   findutils is released, please check #4055 to see if the change has been
-   picked up in this package -->
-   <para>First, suppress a test which on some machines can loop forever:</para>
-
-<screen><userinput remap="pre">sed -i 's/test-lock..EXEEXT.//' tests/Makefile.in</userinput></screen>
-
-    <para>Next, make some fixes required by glibc-2.28 and later:</para>
-
-<screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' gl/lib/*.c
-sed -i '/unistd/a #include &lt;sys/sysmacros.h&gt;' gl/lib/mountlist.c
-echo "#define _IO_IN_BACKUP 0x100" >> gl/lib/stdio-impl.h</userinput></screen>
-
     <para>Prepare Findutils for compilation:</para>
 
@@ -86 +73 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Two tests are known to fail in the chroot environment: 
+    sv-bug-54171.old-O3 and sv-bug-54171.new-O3.</para>
 
     <para revision="sysv">Some of the scripts in the LFS-Bootscripts package

chapter06/glibc.xml

@@ -167 +167 @@
 
     <note><para>The symbolic link above is needed to run the tests at this
-    stage of building in the chroot envirnment.  It will be overwritten
+    stage of building in the chroot environment.  It will be overwritten
     in the install phase below.</para></note>
 

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>
 
@@ -64 +64 @@
 
 <screen><userinput remap="test">make test</userinput></screen>
-<!--
-    <para>One subtest in the test 40-test_rehash.t fails in the lfs chroot 
-    environment, but passes when run as a regular user.</para>
--->
+
+    <para>One subtest in the test 20-test_enc.t is known to fail.</para>
+
     <para>Install the package:</para>