Changeset f1e1fe6 for chapter06/systemd.xml

Timestamp:

11/09/2017 05:48:55 AM (6 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

1e16f1a8

Parents:

3f60e0c

Message:

Simplify linking for systemd and remove text references to /tools/include.

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

File:

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

chapter06/systemd.xml

@@ -47 +47 @@
     <para>Prepare systemd for compilation:</para>
 
-<screen><userinput remap="configure">PKG_CONFIG_PATH=/usr/lib/pkgconfig:/tools/lib/pkgconfig \
-LANG=en_US.UTF-8                          \
-    meson --prefix /usr                   \
-          --sysconfdir /etc               \
-          --localstatedir /var            \
-          -Dblkid=true                    \
-          -Dbuildtype=release             \
-          -Ddefault-dnssec=no             \
-          -Dfirstboot=false               \
-          -Dkill-path=/bin/kill           \
-          -Dkmod-path=/bin/kmod           \
-          -Dldconfig=false                \
-          -Dmount-path=/bin/mount         \
-          -Drootprefix=                   \
-          -Drootlibdir=/lib               \
-          -Dsplit-usr=true                \
-          -Dsulogin-path=/sbin/sulogin    \
-          -Dsysusers=false                \
-          -Dumount-path=/bin/umount       \
-          -Db_lto=false                   \
-          -Dc_link_args="-lblkid -lmount" \
-          -Dc_args="-I/tools/include/blkid -I/tools/include/libmount" \
-          $PWD build</userinput></screen>
+    <screen><userinput remap="configure">
+LANG=en_US.UTF-8  meson --prefix=/usr                   \
+                        --sysconfdir /etc               \
+                        --localstatedir /var            \
+                        -Dblkid=true                    \
+                        -Dbuildtype=release             \
+                        -Ddefault-dnssec=no             \
+                        -Dfirstboot=false               \
+                        -Dkill-path=/bin/kill           \
+                        -Dkmod-path=/bin/kmod           \
+                        -Dldconfig=false                \
+                        -Dmount-path=/bin/mount         \
+                        -Drootprefix=                   \
+                        -Drootlibdir=/lib               \
+                        -Dsplit-usr=true                \
+                        -Dsulogin-path=/sbin/sulogin    \
+                        -Dsysusers=false                \
+                        -Dumount-path=/bin/umount       \
+                        -Db_lto=false                   \
+                        $PWD build</userinput></screen>
 
     <variablelist>
@@ -138 +135 @@
           <filename>/etc/passwd</filename> files. Both files
           were created early in this chapter.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-Dc_link_args="-lblkid -lmount"</parameter></term>
-        <listitem>
-          <para>This switch manually adds libblkid and libmount to the
-          linker flags as they only exist in <filename>/tools/lib</filename>
-          until <application>Util-Linux</application> is installed later in
-          this chapter.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-Dc_args="-I/tools/include/blkid -I/tools/include/libmount"</parameter></term>
-        <listitem>
-          <para>This switch manually adds the include paths for libblkid and
-          libmount to the CFLAGS variable as the packages are not yet installed
-          in the final system.</para>
         </listitem>
       </varlistentry>