diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 875600b24..2387d388a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -35,6 +35,19 @@ --> + + 2014-02-05 + + + [bdubbs] - Fix e2fsprogs tests to run properly + in the LFS chroot envirnment. + + + [bdubbs] - Remove unnecessary mkdir in groff. + + + + 2014-02-02 diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml index bf4332ba9..6fc766ee3 100644 --- a/chapter06/e2fsprogs.xml +++ b/chapter06/e2fsprogs.xml @@ -44,6 +44,11 @@ Installation of E2fsprogs + First fix a problem with running regression tests in the LFS chroot + environment: + +sed -i -e 's|^LD_LIBRARY_PATH.*|&:/tools/lib|' tests/test_config + The E2fsprogs documentation recommends that the package be built in a subdirectory of the source tree: @@ -52,16 +57,15 @@ cd build Prepare E2fsprogs for compilation: -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 \ +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 @@ -131,10 +135,9 @@ CFLAGS=-I/tools/include \ make install - Install the static libraries and headers and do some clean up: + Install the static libraries: -make install-libs -unset PKG_CONFIG_PATH +make install-libs Make the installed static libraries writable so debugging symbols can be removed later: diff --git a/chapter06/groff.xml b/chapter06/groff.xml index 7aaef076b..69a51a36c 100644 --- a/chapter06/groff.xml +++ b/chapter06/groff.xml @@ -61,8 +61,7 @@ Install the package: -mkdir -pv /usr/share/doc/groff-1.22/pdf -make install +make install Some documentation programs, such as xman, will not work properly without the following symlinks: diff --git a/general.ent b/general.ent index 88a5d7fd5..27355554b 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + +