Changeset f8756ab for chapter06/e2fsprogs.xml

Timestamp:

02/15/2014 12:40:11 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

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

Children:

3e2ac00

Parents:

e88c73c

Message:

Merge latest LFS SVN.

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

File:

• chapter06/e2fsprogs.xml (modified) (3 diffs)

chapter06/e2fsprogs.xml

@@ -45 +45 @@
     <title>Installation of E2fsprogs</title>
 
+    <para>First fix a problem with running regression tests in the LFS chroot
+    environment:</para>
+
+<screen><userinput remap="pre">sed -i -e 's|^LD_LIBRARY_PATH.*|&amp;:/tools/lib|' tests/test_config</userinput></screen>
+
     <para>The E2fsprogs documentation recommends that the package be built in
     a subdirectory of the source tree: </para>
@@ -53 +58 @@
     <para>Prepare E2fsprogs for compilation:</para>
 
-<screen><userinput remap="configure">export PKG_CONFIG_PATH=/tools/lib/pkgconfig 
-
-LIBS=-L/tools/lib                  \
-CFLAGS=-I/tools/include            \
-../configure --prefix=/usr         \
-             --with-root-prefix="" \
-             --enable-elf-shlibs   \
-             --disable-libblkid    \
-             --disable-libuuid     \
-             --disable-uuidd       \
+<screen><userinput remap="configure">LIBS=-L/tools/lib                    \
+CFLAGS=-I/tools/include              \
+PKG_CONFIG_PATH=/tools/lib/pkgconfig \
+../configure --prefix=/usr           \
+             --with-root-prefix=""   \
+             --enable-elf-shlibs     \
+             --disable-libblkid      \
+             --disable-libuuid       \
+             --disable-uuidd         \
              --disable-fsck</userinput></screen>
 
@@ -132 +136 @@
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Install the static libraries and headers and do some clean up:</para>
-
-<screen><userinput remap="install">make install-libs
-unset PKG_CONFIG_PATH</userinput></screen>
+    <para>Install the static libraries and headers:</para>
+
+<screen><userinput remap="install">make install-libs</userinput></screen>
 
     <para>Make the installed static libraries writable so debugging symbols can