diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2017-11-09 05:48:55 +0000 |
|---|---|---|
| committer | DJ Lucas <dj@linuxfromscratch.org> | 2017-11-09 05:48:55 +0000 |
| commit | f1e1fe657992d117b5565129e33d7f0a6956e45f (patch) | |
| tree | 709eb329b797fbcf07de79e0b9a1ff2f1b32e366 /chapter06/systemd.xml | |
| parent | 3f60e0c7231bdd4d6decc44486b6e2547702e356 (diff) | |
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
Diffstat (limited to 'chapter06/systemd.xml')
| -rw-r--r-- | chapter06/systemd.xml | 62 |
1 files changed, 20 insertions, 42 deletions
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 84a66466e..923b7a36f 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -46,29 +46,26 @@ <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> <title>The meaning of the meson options:</title> @@ -140,25 +137,6 @@ LANG=en_US.UTF-8 \ </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> - </variablelist> <para>Compile the package:</para> |