From e88a471b185846c93c91f39dcd12aa147006b03e Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Fri, 22 Dec 2017 06:20:59 +0000
Subject: Update to util-linux-2.31.1.  Fixes #4176. Correct build issue with
 systemd-236 tests.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11338 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/systemd.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'chapter06')

diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 192e0035c..867b6fdcf 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -43,10 +43,15 @@
     <para>Create a symlink to work around missing xsltproc:</para>
 
 <screen><userinput remap="pre">ln -sf /tools/bin/true /usr/bin/xsltproc</userinput></screen>
+
     <para>Set up the man pages:</para>
 
 <screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
 
+    <para>Remove tests that cannot be built in chroot:</para>
+
+<screen><userinput remap="pre">sed '179,223d' -i src/resolve/meson.build</userinput></screen>
+
     <para>Prepare systemd for compilation:</para>
 
     <screen><userinput remap="configure">mkdir -p build
@@ -60,6 +65,7 @@ meson --prefix=/usr                \
       -Dbuildtype=release          \
       -Ddefault-dnssec=no          \
       -Dfirstboot=false            \
+      -Dinstall-tests=false        \
       -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
       -Dldconfig=false             \
@@ -103,6 +109,13 @@ meson --prefix=/usr                \
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Dinstall-tests=false</parameter></term>
+        <listitem>
+          <para>This switch prevents installation of the compiled tests.</para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><parameter>-Dldconfig=no</parameter></term>
         <listitem>
-- 
cgit v1.2.3-54-g00ecf