Changeset e88c73c for chapter06/systemd.xml

Timestamp:

02/04/2014 11:36:05 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.5-systemd, 7.6-systemd, 7.7-systemd, 7.8-systemd, 7.9-systemd

Children:

f8756ab

Parents:

848907c

Message:

Merge latest lfs svn, update to D-Bus 1.8.0, fix Systemd to build with latest lfs changes.

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

File:

• chapter06/systemd.xml (modified) (5 diffs)

chapter06/systemd.xml

@@ -41 +41 @@
     <title>Installation of Systemd</title>
 
+    <para>First, create a file to allow Systemd to build when using Util-Linux
+    built in Chapter 5:</para>
+
+<screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
+<literal>KILL=/bin/kill
+HAVE_BLKID=1
+BLKID_LIBS="-lblkid"
+BLKID_CFLAGS="-I/tools/include/blkid"</literal>
+EOF</userinput></screen>
+
+    <para>Aditionally, fix a build error when using Util-Linux built in
+    Chapter 5:</para>
+
+<screen><userinput remap="pre">sed -i "s:blkid/::" src/udev/udev-builtin-blkid.c</userinput></screen>
+
     <para>Prepare Systemd for compilation:</para>
 
@@ -48 +63 @@
             --libexecdir=/usr/lib \
             --docdir=/usr/share/doc/systemd-&systemd-version; \
+            --config-cache \
             --with-rootprefix= \
             --with-rootlibdir=/lib \
@@ -58 +74 @@
 
       <varlistentry>
-        <term><parameter>--with-root-*</parameter></term>
+        <term><parameter>--config-cache</parameter></term>
+        <listitem>
+          <para>This switch tells the build system to use
+          the <filename>config.cache</filename> file which
+          was created earlier.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>--with-root*</parameter></term>
         <listitem>
           <para>These switches ensure that core programs and
@@ -87 +112 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make LIBRARY_PATH=/tools/lib</userinput></screen>
 
     <para>The package comes with a testsuite, but it doesn't work in
@@ -94 +119 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
 
     <para>Install manual pages which are shipped in the tarball, but were