r1392 - in trunk/BOOK: . cross-tools/common final-system/common

chris at linuxfromscratch.org chris at linuxfromscratch.org
Mon Apr 17 00:47:50 PDT 2006


Author: chris
Date: 2006-04-17 01:47:47 -0600 (Mon, 17 Apr 2006)
New Revision: 1392

Modified:
   trunk/BOOK/cross-tools/common/glibc.xml
   trunk/BOOK/final-system/common/glibc.xml
   trunk/BOOK/general.ent
Log:
Changed Glibc sed in cross-tools to xinclude pointing to final-system.

Modified: trunk/BOOK/cross-tools/common/glibc.xml
===================================================================
--- trunk/BOOK/cross-tools/common/glibc.xml	2006-04-17 00:33:19 UTC (rev 1391)
+++ trunk/BOOK/cross-tools/common/glibc.xml	2006-04-17 07:47:47 UTC (rev 1392)
@@ -38,6 +38,14 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
     <para os="s1">The following sed fixes a build issue with Glibc. This will
     prevent nscd from trying to link to libraries that don't exist:</para>
 

Modified: trunk/BOOK/final-system/common/glibc.xml
===================================================================
--- trunk/BOOK/final-system/common/glibc.xml	2006-04-17 00:33:19 UTC (rev 1391)
+++ trunk/BOOK/final-system/common/glibc.xml	2006-04-17 07:47:47 UTC (rev 1392)
@@ -59,10 +59,12 @@
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
 
-    <para os="s1">The following sed fixes a build issue with Glibc, this will prevent nscd from trying
-to link to libraries, that don't exist:</para>
+    <para os="s1">The following sed fixes a build issue with Glibc. This
+    will prevent nscd from trying to link to libraries that don't exist:</para>
 
-<screen os="s2"><userinput>sed -i "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile</userinput></screen>
+<screen os="s2"><userinput>cp nscd/Makefile{,.orig}
+sed -e "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile.orig >
+nscd/Makefile</userinput></screen>
 
     <para os="e">The Glibc documentation recommends building Glibc outside of the
     source directory in a dedicated build directory:</para>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-04-17 00:33:19 UTC (rev 1391)
+++ trunk/BOOK/general.ent	2006-04-17 07:47:47 UTC (rev 1392)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20060413">
+<!ENTITY version "CLFS-SVN-20060417">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
@@ -15,7 +15,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "April 13, 2006">
+<!ENTITY releasedate "April 17, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 




More information about the cross-lfs mailing list