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

5 files changed, 43 insertions, 21 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1b6399192..54f1e5d60 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,23 @@
 -->
 
     <listitem>
+      <para>2015-04-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Prevent /tools from being hard coded into
+          eudev binaries.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-3.8.3. Fixes
+          <ulink url="&lfs-ticket-root;3778">#3778</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Suppress duplicate installation of attr man pages.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2015-04-16</para>
       <itemizedlist>
         <listitem>
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>
diff --git a/general.ent b/general.ent
index 94d364139..89a397b01 100644
--- a/general.ent
+++ b/general.ent
@@ -1,7 +1,7 @@
-<!ENTITY version         "SVN-20150416">
+<!ENTITY version         "SVN-20150421">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;. Change to x.y for release 
                                       but not -rc releases -->
-<!ENTITY releasedate     "April 16, 2015">
+<!ENTITY releasedate     "April 21, 2015">
 <!ENTITY copyrightdate   "1999-2015"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 825fd00a2..016bac90e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -138,11 +138,6 @@
 <!ENTITY eudev-size "1,793 KB">
 <!ENTITY eudev-url "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
 <!ENTITY eudev-md5 "a2706a1413723b6b82eecb7d6982763c">
-<!--
-<!ENTITY eudev-manpages-size "9 KB">
-<!ENTITY eudev-manpages-url "&anduin-other;eudev-&eudev-version;-manpages.tar.bz2">
-<!ENTITY eudev-manpages-md5 "5be15528788635818104146957171f5d">
--->
 <!ENTITY eudev-ch6-du "95 MB">
 <!ENTITY eudev-ch6-sbu "0.2 SBU">
 
@@ -433,10 +428,10 @@
 <!ENTITY man-db-ch6-du "33 MB">
 <!ENTITY man-db-ch6-sbu "0.4 SBU">
 
-<!ENTITY man-pages-version "3.82">
-<!ENTITY man-pages-size "1,326 KB">
+<!ENTITY man-pages-version "3.83">
+<!ENTITY man-pages-size "1,333 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "b3d4d949530d0ce13971040b53cf7a39">
+<!ENTITY man-pages-md5 "a8d21f07f4ee01a117f196ab2f5e260a">
 <!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-ch6-du "35 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">