aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml13
-rw-r--r--chapter05/glibc.xml16
-rw-r--r--chapter06/glibc.xml7
-rw-r--r--general.ent4
4 files changed, 32 insertions, 8 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4239ac293..e8792729b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,19 @@
-->
<listitem>
+ <para>2012-08-27</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add instructions to Chapter 5 glibc
+ to add rpc headers to the host system if they are missing.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Apply upstream patches to make.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-08-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 5f90ad46a..88fde346d 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -43,6 +43,19 @@
<sect2 role="installation">
<title>Installation of Glibc</title>
+ <para>In some cases, particularly LFS 7.1, the rpc headers were not
+ installed properly. Test to see if they are installed in the host system
+ and install if they are not:</para>
+
+<screen><userinput remap="pre">if [ ! -r /usr/include/rpc/types.h ]; then
+ su -c 'mkdir -p /usr/include/rpc'
+ su -c 'cp -v sunrpc/rpc/*.h /usr/include/rpc'
+fi</userinput></screen>
+
+ <para>Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:</para>
+
+<screen><userinput remap="pre">sed -i 's/ -lgcc_s//' Makeconfig</userinput></screen>
+
<para>The Glibc documentation recommends building Glibc outside of the source
directory in a dedicated build directory:</para>
@@ -63,9 +76,6 @@ cd ../glibc-build</userinput></screen>
i?86) echo "CFLAGS += -march=i486 -mtune=native" &gt; configparms ;;
esac</userinput></screen>
-->
- <para>Fix an issue when building Glibc-&glibc-version; with GCC-&gcc-version;:</para>
-
-<screen><userinput remap="pre">sed -i 's/ -lgcc_s//' ../glibc-&glibc-version;/Makeconfig</userinput></screen>
<para>Next, prepare Glibc for compilation:</para>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index bedbcde0f..99911bc33 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -71,11 +71,11 @@
<screen><userinput remap="pre">sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED</userinput></screen>
-->
-
+<!--
<para>Fix a bug that causes the build to fail:</para>
<screen><userinput remap="pre">sed -i 's#&lt;rpc/types.h&gt;#"rpc/types.h"#' sunrpc/rpc_clntout.c</userinput></screen>
-
+-->
<!-- <para>When running <command>make install</command>, a script called
<filename>test-installation.pl</filename> performs a small sanity test on
our newly installed Glibc. However, because our toolchain still points to
@@ -223,7 +223,8 @@ grep Error glibc-check-log</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
<para>Install NIS and RPC related headers that are not installed by
- default; these are required by several BLFS packages:</para>
+ default; these are required ito rebuild glibc and by several BLFS
+ packages:</para>
<screen><userinput remap="install">cp -v ../glibc-&glibc-version;/sunrpc/rpc/*.h /usr/include/rpc
cp -v ../glibc-&glibc-version;/sunrpc/rpcsvc/*.h /usr/include/rpcsvc
diff --git a/general.ent b/general.ent
index b0838923d..f88a606a9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120826">
-<!ENTITY releasedate "August 26, 2012">
+<!ENTITY version "SVN-20120827">
+<!ENTITY releasedate "August 27, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.2">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->