Changeset a33dbaa

Timestamp:

Apr 17, 2006, 4:48:36 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

50a4c58

Parents:

ff10da6a

Message:

r2914@server (orig r1392): chris | 2006-04-17 00:47:47 -0700
Changed Glibc sed in cross-tools to xinclude pointing to final-system.

Location:

BOOK

Files:

• cross-tools/common/glibc.xml (modified) (1 diff)
• final-system/common/glibc.xml (modified) (1 diff)
• general.ent (modified) (2 diffs)

BOOK/cross-tools/common/glibc.xml

@@ -38 +38 @@
     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

BOOK/final-system/common/glibc.xml

@@ -60 +60 @@
 <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>
-
-<screen os="s2"><userinput>sed -i "/nscd_stat.o: sysincludes = # nothing/d" nscd/Makefile</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>
+
+<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

BOOK/general.ent

@@ -1 +1 @@
 <?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">
@@ -16 +16 @@
 <!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}]" -->