aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/bison.xml2
-rw-r--r--chapter06/findutils.xml16
-rw-r--r--chapter06/glibc.xml2
-rw-r--r--chapter06/openssl.xml11
4 files changed, 10 insertions, 21 deletions
diff --git a/chapter06/bison.xml b/chapter06/bison.xml
index 05bf30cd4..00a4e78f7 100644
--- a/chapter06/bison.xml
+++ b/chapter06/bison.xml
@@ -42,7 +42,7 @@
<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>
diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml
index 20da93a41..3b227eb46 100644
--- a/chapter06/findutils.xml
+++ b/chapter06/findutils.xml
@@ -43,19 +43,6 @@
<sect2 role="installation">
<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>
<screen><userinput remap="configure">./configure --prefix=/usr --localstatedir=/var/lib/locate</userinput></screen>
@@ -86,6 +73,9 @@ echo "#define _IO_IN_BACKUP 0x100" >> gl/lib/stdio-impl.h</userinput></screen>
<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
depend on <command>find</command>. As <filename
class="directory">/usr</filename> may not be available during the early
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index c7e09499c..2c8363816 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -166,7 +166,7 @@ cd build</userinput></screen>
esac</userinput></screen>
<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>
<screen><userinput remap="test">make check</userinput></screen>
diff --git a/chapter06/openssl.xml b/chapter06/openssl.xml
index 6d55a0552..291f5887b 100644
--- a/chapter06/openssl.xml
+++ b/chapter06/openssl.xml
@@ -42,12 +42,12 @@
<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>
<screen><userinput remap="configure">./config --prefix=/usr \
@@ -63,10 +63,9 @@
<para>To test the results, issue:</para>
<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>
<screen><userinput remap="install">sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile