aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorPierre Labastie <pieere@linuxfromscratch.org>2020-06-04 06:51:00 +0000
committerPierre Labastie <pieere@linuxfromscratch.org>2020-06-04 06:51:00 +0000
commitd53fefab5a6772fef606392a61608fc290e6a7ae (patch)
tree60967f6e0cbcd61731498485cc103888c67c40b5 /chapter06
parentc3007946a7b0b2c6c19929a1a933ce7fe1558525 (diff)
Update to upstream r11895cross-chap5
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11896 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/libelf.xml2
-rw-r--r--chapter06/systemd.xml12
2 files changed, 7 insertions, 7 deletions
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 4af178726..b559e6aa2 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -56,7 +56,7 @@
<screen><userinput remap="test">make check</userinput></screen>
- <para>One test, run-elfclassify.sh, is known to fail.</para>
+<!-- <para>One test, run-elfclassify.sh, is known to fail.</para>-->
<para>Install only Libelf:</para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index cbba14a69..2cf2d1d1b 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -39,12 +39,11 @@
<sect2 role="installation">
<title>Installation of systemd</title>
-<!--
- <para>First, apply a patch to fix various bugs since the release
- of systemd-243.</para>
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
--->
+ <para>First, apply a patch to fix the build with GCC-10:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-1.patch</userinput></screen>
+
<para>Create a symlink to work around missing xsltproc:</para>
@@ -73,7 +72,6 @@ LANG=en_US.UTF-8 \
meson --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- -Dc_args=-Wno-format-overflow \
-Dblkid=true \
-Dbuildtype=release \
-Ddefault-dnssec=no \
@@ -98,6 +96,7 @@ meson --prefix=/usr \
<variablelist>
<title>The meaning of the meson options:</title>
+<!--
<varlistentry>
<term><parameter>-Dc_args=-Wno-format-overflow</parameter></term>
<listitem>
@@ -107,6 +106,7 @@ meson --prefix=/usr \
from occuring.</para>
</listitem>
</varlistentry>
+-->
<varlistentry>
<term><parameter>-D*-path=*</parameter></term>