From 99dd957967a0fbfb160ad375693835fb6bbea951 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 21 Apr 2015 22:21:54 +0000
Subject: Prevent /tools from being hard coded into eudev binaries. Update to
 man-pages-3.8.3. Suppress duplicate installation of attr man pages.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10895 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/attr.xml  |  5 +++++
 chapter06/eudev.xml | 27 ++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/attr.xml b/chapter06/attr.xml
index d565b143c..22f487b72 100644
--- a/chapter06/attr.xml
+++ b/chapter06/attr.xml
@@ -46,6 +46,11 @@
 
 <screen><userinput remap="pre">sed -i -e 's|/@pkg_name@|&amp;-@pkg_version@|' include/builddefs.in</userinput></screen>
 
+    <para>Prevent installation of manual pages that were already installed by
+    the <xref linkend="man-pages"/> package:</para>
+
+<screen><userinput remap="pre">sed -i -e "/SUBDIRS/s|man2||" man/Makefile</userinput></screen>
+
     <para>Prepare Attr for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml
index 18e3bdff6..3c33e483b 100644
--- a/chapter06/eudev.xml
+++ b/chapter06/eudev.xml
@@ -44,11 +44,18 @@
 
 <screen><userinput remap="pre">sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl</userinput></screen>
 
+    <para>Next, add a workaround to prevent the /tools directory from being 
+    hard coded into Eudev binary files library locations:</para>
+
+<screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
+HAVE_BLKID=1
+BLKID_LIBS="-lblkid"
+BLKID_CFLAGS="-I/tools/include"
+EOF</userinput></screen>
+
 <para>Prepare Eudev for compilation:</para>
 
-<screen><userinput remap="configure">BLKID_CFLAGS=-I/tools/include       \
-BLKID_LIBS='-L/tools/lib -lblkid'   \
-./configure --prefix=/usr           \
+<screen><userinput remap="configure">./configure --prefix=/usr           \
             --bindir=/sbin          \
             --sbindir=/sbin         \
             --libdir=/usr/lib       \
@@ -57,17 +64,15 @@ BLKID_LIBS='-L/tools/lib -lblkid'   \
             --with-rootprefix=      \
             --with-rootlibdir=/lib  \
             --enable-split-usr      \
-            --enable-libkmod        \
-            --enable-rule_generator \
-            --enable-keymap         \
             --disable-introspection \
             --disable-gudev         \
             --disable-static        \
+            --config-cache          \
             --disable-gtk-doc-html</userinput></screen>
 
 <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">LIBRARY_PATH=/tools/lib make</userinput></screen>
 
 <para>Create some directories now that are needed for tests, but
 will also be used as a part of installation:</para>
@@ -77,11 +82,11 @@ mkdir -pv /etc/udev/rules.d</userinput></screen>
 
 <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make LD_LIBRARY_PATH=/tools/lib check</userinput></screen>
 
     <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>Now, install the man pages:</para>
 
@@ -89,7 +94,7 @@ mkdir -pv /etc/udev/rules.d</userinput></screen>
 make install-man7 install-man8
 popd</userinput></screen>
 
-    <para>Finally, install some custom rules and support files useful in an LFS 
+    <para>Install some custom rules and support files useful in an LFS 
     environment:</para>
 
 <screen><userinput remap="install">tar -xvf ../&udev-lfs-version;.tar.bz2
@@ -116,7 +121,7 @@ make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
     into a binary database <filename>/etc/udev/hwdb.bin</filename>. Create the
     initial database:</para>
 
-<screen><userinput>udevadm hwdb --update</userinput></screen>
+<screen><userinput>LD_LIBRARY_PATH=/tools/lib udevadm hwdb --update</userinput></screen>
 
     <para>This command needs to be run each time the hardware information is
     updated.</para>
-- 
cgit v1.2.3-54-g00ecf