[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. c8d441465e6856781cba1c777196ad10789363c6
git
git at cross-lfs.org
Sun Aug 8 13:52:23 PDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via c8d441465e6856781cba1c777196ad10789363c6 (commit)
from 601a163c0b8bdbff8aa38eba1a609e682f2df538 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c8d441465e6856781cba1c777196ad10789363c6
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 16:53:36 2010 -0400
Add a patch to EGlibc to fix a compatibility issue with Make 3.82.
diff --git a/BOOK/cross-tools/64/eglibc.xml b/BOOK/cross-tools/64/eglibc.xml
index 4e02888..d18880f 100644
--- a/BOOK/cross-tools/64/eglibc.xml
+++ b/BOOK/cross-tools/64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/alpha/eglibc-headers.xml b/BOOK/cross-tools/alpha/eglibc-headers.xml
index f8ff542..3854b5f 100644
--- a/BOOK/cross-tools/alpha/eglibc-headers.xml
+++ b/BOOK/cross-tools/alpha/eglibc-headers.xml
@@ -22,6 +22,14 @@
<sect2 role="installation">
<title>Installation of EGLIBC Headers</title>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
<para os="s1">EGLIBC's <filename>configure</filename> script checks the
version of GCC, and will fail if it's less than 3.4. The next EGLIBC build
will use the GCC that will be installed into
diff --git a/BOOK/cross-tools/alpha/eglibc.xml b/BOOK/cross-tools/alpha/eglibc.xml
index bb9551e..7285a3a 100644
--- a/BOOK/cross-tools/alpha/eglibc.xml
+++ b/BOOK/cross-tools/alpha/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/common/eglibc.xml b/BOOK/cross-tools/common/eglibc.xml
index a743d16..4eef89b 100644
--- a/BOOK/cross-tools/common/eglibc.xml
+++ b/BOOK/cross-tools/common/eglibc.xml
@@ -26,6 +26,14 @@
the method suggested in this book puts the stability of the system at
risk.</para>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
<para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
<screen os="dc"><userinput>cp -v Makeconfig{,.orig}
diff --git a/BOOK/cross-tools/mips/eglibc.xml b/BOOK/cross-tools/mips/eglibc.xml
index 77dfe1e..b0bb82c 100644
--- a/BOOK/cross-tools/mips/eglibc.xml
+++ b/BOOK/cross-tools/mips/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/mips/eglibc.xml"
xpointer="xpointer(//*[@os='g1'])"/>
diff --git a/BOOK/cross-tools/mips64-64/eglibc.xml b/BOOK/cross-tools/mips64-64/eglibc.xml
index f9c190a..334b864 100644
--- a/BOOK/cross-tools/mips64-64/eglibc.xml
+++ b/BOOK/cross-tools/mips64-64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../mips/eglibc.xml"
xpointer="xpointer(//*[@os='g1'])"/>
diff --git a/BOOK/cross-tools/mips64/eglibc-64bit.xml b/BOOK/cross-tools/mips64/eglibc-64bit.xml
index 40036b7..59f7bbc 100644
--- a/BOOK/cross-tools/mips64/eglibc-64bit.xml
+++ b/BOOK/cross-tools/mips64/eglibc-64bit.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="eglibc.xml"
xpointer="xpointer(//*[@os='g1'])"/>
diff --git a/BOOK/cross-tools/mips64/eglibc-n32.xml b/BOOK/cross-tools/mips64/eglibc-n32.xml
index ea349cc..84d7ec0 100644
--- a/BOOK/cross-tools/mips64/eglibc-n32.xml
+++ b/BOOK/cross-tools/mips64/eglibc-n32.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="eglibc.xml"
xpointer="xpointer(//*[@os='g1'])"/>
diff --git a/BOOK/cross-tools/mips64/eglibc.xml b/BOOK/cross-tools/mips64/eglibc.xml
index 3c1b68d..8b823a9 100644
--- a/BOOK/cross-tools/mips64/eglibc.xml
+++ b/BOOK/cross-tools/mips64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../mips/eglibc.xml"
xpointer="xpointer(//*[@os='g1'])"/>
diff --git a/BOOK/cross-tools/multilib/eglibc-64bit.xml b/BOOK/cross-tools/multilib/eglibc-64bit.xml
index 95ac787..8d22947 100644
--- a/BOOK/cross-tools/multilib/eglibc-64bit.xml
+++ b/BOOK/cross-tools/multilib/eglibc-64bit.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/multilib/eglibc.xml b/BOOK/cross-tools/multilib/eglibc.xml
index 58ce794..1c5cf4c 100644
--- a/BOOK/cross-tools/multilib/eglibc.xml
+++ b/BOOK/cross-tools/multilib/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/ppc/eglibc.xml b/BOOK/cross-tools/ppc/eglibc.xml
index 3320d83..1fe46f8 100644
--- a/BOOK/cross-tools/ppc/eglibc.xml
+++ b/BOOK/cross-tools/ppc/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/ppc64/eglibc-64bit.xml b/BOOK/cross-tools/ppc64/eglibc-64bit.xml
index 5086fcf..7f9722f 100644
--- a/BOOK/cross-tools/ppc64/eglibc-64bit.xml
+++ b/BOOK/cross-tools/ppc64/eglibc-64bit.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/ppc64/eglibc.xml b/BOOK/cross-tools/ppc64/eglibc.xml
index 68117b7..a578af5 100644
--- a/BOOK/cross-tools/ppc64/eglibc.xml
+++ b/BOOK/cross-tools/ppc64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/sparc64-64/eglibc.xml b/BOOK/cross-tools/sparc64-64/eglibc.xml
index befc0bd..2cfbc15 100644
--- a/BOOK/cross-tools/sparc64-64/eglibc.xml
+++ b/BOOK/cross-tools/sparc64-64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/sparc64/eglibc-64bit.xml b/BOOK/cross-tools/sparc64/eglibc-64bit.xml
index aaf9136..32666a8 100644
--- a/BOOK/cross-tools/sparc64/eglibc-64bit.xml
+++ b/BOOK/cross-tools/sparc64/eglibc-64bit.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/sparc64/eglibc.xml b/BOOK/cross-tools/sparc64/eglibc.xml
index 58ce794..1c5cf4c 100644
--- a/BOOK/cross-tools/sparc64/eglibc.xml
+++ b/BOOK/cross-tools/sparc64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/x86/eglibc.xml b/BOOK/cross-tools/x86/eglibc.xml
index a508bd1..7a7976f 100644
--- a/BOOK/cross-tools/x86/eglibc.xml
+++ b/BOOK/cross-tools/x86/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/cross-tools/x86_64/eglibc.xml b/BOOK/cross-tools/x86_64/eglibc.xml
index a913374..bd46883 100644
--- a/BOOK/cross-tools/x86_64/eglibc.xml
+++ b/BOOK/cross-tools/x86_64/eglibc.xml
@@ -27,6 +27,14 @@
xpointer="xpointer(//*[@os='da'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../../final-system/common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='db'])"/>
diff --git a/BOOK/final-system/alpha/eglibc.xml b/BOOK/final-system/alpha/eglibc.xml
index 8948b18..67147b2 100644
--- a/BOOK/final-system/alpha/eglibc.xml
+++ b/BOOK/final-system/alpha/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/common/eglibc.xml b/BOOK/final-system/common/eglibc.xml
index 346d9ee..1ab49bc 100644
--- a/BOOK/final-system/common/eglibc.xml
+++ b/BOOK/final-system/common/eglibc.xml
@@ -38,6 +38,11 @@
Unicode, therefore libiconv is not required on a CLFS system.</para>
</note>
+ <para os="mp1">The following patch fixes a compatibility issue with Make
+ 3.82 and newer.</para>
+
+<screen os="mp2"><userinput>patch -Np1 -i ../&eglibc-make382-patch;</userinput></screen>
+
<para os="l3">The following sed makes sure that newly built EGLIBC is tested,
during make install, instead of the one we previously build:</para>
diff --git a/BOOK/final-system/mips/eglibc.xml b/BOOK/final-system/mips/eglibc.xml
index 781a5f3..78cbc55 100644
--- a/BOOK/final-system/mips/eglibc.xml
+++ b/BOOK/final-system/mips/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/mips64-64/eglibc.xml b/BOOK/final-system/mips64-64/eglibc.xml
index fb2ed80..c30581e 100644
--- a/BOOK/final-system/mips64-64/eglibc.xml
+++ b/BOOK/final-system/mips64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/mips64/eglibc-64bit.xml b/BOOK/final-system/mips64/eglibc-64bit.xml
index 747f97f..ba2db25 100644
--- a/BOOK/final-system/mips64/eglibc-64bit.xml
+++ b/BOOK/final-system/mips64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/mips64/eglibc-n32.xml b/BOOK/final-system/mips64/eglibc-n32.xml
index 37fc638..fbb7649 100644
--- a/BOOK/final-system/mips64/eglibc-n32.xml
+++ b/BOOK/final-system/mips64/eglibc-n32.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
diff --git a/BOOK/final-system/mips64/eglibc.xml b/BOOK/final-system/mips64/eglibc.xml
index 7440833..bd40561 100644
--- a/BOOK/final-system/mips64/eglibc.xml
+++ b/BOOK/final-system/mips64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/multilib/eglibc-64bit.xml b/BOOK/final-system/multilib/eglibc-64bit.xml
index fac50c6..dc10caf 100644
--- a/BOOK/final-system/multilib/eglibc-64bit.xml
+++ b/BOOK/final-system/multilib/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's at .*interpret.*/tools\(.*\)]$@\1 at p')
diff --git a/BOOK/final-system/multilib/eglibc.xml b/BOOK/final-system/multilib/eglibc.xml
index 818fe3f..04fdc01 100644
--- a/BOOK/final-system/multilib/eglibc.xml
+++ b/BOOK/final-system/multilib/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/ppc/eglibc.xml b/BOOK/final-system/ppc/eglibc.xml
index e12a9f7..9ac8f76 100644
--- a/BOOK/final-system/ppc/eglibc.xml
+++ b/BOOK/final-system/ppc/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/ppc64/eglibc-64bit.xml b/BOOK/final-system/ppc64/eglibc-64bit.xml
index 9e43052..76ff86a 100644
--- a/BOOK/final-system/ppc64/eglibc-64bit.xml
+++ b/BOOK/final-system/ppc64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/ppc64/eglibc.xml b/BOOK/final-system/ppc64/eglibc.xml
index 443a8f1..66cdd3d 100644
--- a/BOOK/final-system/ppc64/eglibc.xml
+++ b/BOOK/final-system/ppc64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/sparc64-64/eglibc.xml b/BOOK/final-system/sparc64-64/eglibc.xml
index aa09c05..9631ea2 100644
--- a/BOOK/final-system/sparc64-64/eglibc.xml
+++ b/BOOK/final-system/sparc64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/sparc64/eglibc-64bit.xml b/BOOK/final-system/sparc64/eglibc-64bit.xml
index 6e0b0eb..16e95d4 100644
--- a/BOOK/final-system/sparc64/eglibc-64bit.xml
+++ b/BOOK/final-system/sparc64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/x86/eglibc.xml b/BOOK/final-system/x86/eglibc.xml
index 8edf4a9..cfb2adf 100644
--- a/BOOK/final-system/x86/eglibc.xml
+++ b/BOOK/final-system/x86/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/x86_64-64/eglibc.xml b/BOOK/final-system/x86_64-64/eglibc.xml
index 7b0b2ab..8ca2122 100644
--- a/BOOK/final-system/x86_64-64/eglibc.xml
+++ b/BOOK/final-system/x86_64-64/eglibc.xml
@@ -27,6 +27,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/x86_64/eglibc-64bit.xml b/BOOK/final-system/x86_64/eglibc-64bit.xml
index c64eceb..0a7cea4 100644
--- a/BOOK/final-system/x86_64/eglibc-64bit.xml
+++ b/BOOK/final-system/x86_64/eglibc-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/final-system/x86_64/eglibc.xml b/BOOK/final-system/x86_64/eglibc.xml
index 9babda5..d1bce14 100644
--- a/BOOK/final-system/x86_64/eglibc.xml
+++ b/BOOK/final-system/x86_64/eglibc.xml
@@ -28,6 +28,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
+ xpointer="xpointer(//*[@os='mp2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='l3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index ca75fd6..1e5b7c5 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,10 @@
<para>August 08, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Add a patch to EGlibc to fix a compatibility issue
+ with Make 3.82.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated Make to 3.82.</para>
</listitem>
<listitem>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 3809fb1..0c7857d 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -37,6 +37,15 @@
</varlistentry>
<varlistentry>
+ <term>EGLIBC Make 3.82 Compatiblity Patch - <token>&eglibc-make382-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&eglibc-make382-patch;"/></para>
+ <para>MD5 sum: <literal>&eglibc-make382-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Expect NoTk Patch - <token>&expect-notk-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 6d367d1..934c37d 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -117,8 +117,9 @@
<!ENTITY eglibc-version "2.12">
<!ENTITY eglibc-date "20100725">
<!ENTITY eglibc-revision "11059">
+<!ENTITY eglibc-fversion "&eglibc-version;-&eglibc-date;-r&eglibc-revision;">
<!ENTITY eglibc-size "15,996 KB">
-<!ENTITY eglibc-url "&packages-root;eglibc-&eglibc-version;-&eglibc-date;-r&eglibc-revision;.tar.bz2">
+<!ENTITY eglibc-url "&packages-root;eglibc-&eglibc-fversion;.tar.bz2">
<!ENTITY eglibc-md5 "828c070552138fa209f65a77fbcb48db">
<!ENTITY eglibc-home "http://www.eglibc.org/home">
<!ENTITY eglibc-ld-name "ld-&eglibc-version;.so">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index c0b8a09..6008cb7 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -20,6 +20,10 @@
<!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
<!ENTITY flex-gcc44-patch-size "12 KB">
+<!ENTITY eglibc-make382-patch "eglibc-&eglibc-fversion;-make382-1.patch">
+<!ENTITY eglibc-make382-patch-md5 "4d8eb0f7f417271807449d930adf4f5c">
+<!ENTITY eglibc-make382-patch-size "4 KB">
+
<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
<!ENTITY gcc-specs-patch-md5 "9ba70e5765be93577166d824064e675a">
<!ENTITY gcc-specs-patch-size "20 KB">
diff --git a/patches/eglibc-2.12-20100725-r11059-make382-1.patch b/patches/eglibc-2.12-20100725-r11059-make382-1.patch
new file mode 100644
index 0000000..3c2ab66
--- /dev/null
+++ b/patches/eglibc-2.12-20100725-r11059-make382-1.patch
@@ -0,0 +1,24 @@
+Submitted By: Joe Ciccone <jciccone at gmail.com
+Date: 2010-08-08
+Initial Package Version: 2.12
+Upstream Status: Unknown
+Origin: Joe Ciccone
+Description: Seperates the normal and implcit rules, make 3.82 complains
+ when they are defined on the same line.
+
+diff -Naur eglibc-2.12.orig/manual/Makefile eglibc-2.12/manual/Makefile
+--- eglibc-2.12.orig/manual/Makefile 2010-03-31 19:12:26.000000000 +0000
++++ eglibc-2.12/manual/Makefile 2010-08-08 20:29:22.905807775 +0000
+@@ -243,7 +243,11 @@
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++$(objpfx)stubs ../po/manual.pot:
++ $(make-target-directory)
++ touch $@
++
++$(objpfx)stamp%:
+ $(make-target-directory)
+ touch $@
+
-----------------------------------------------------------------------
Summary of changes:
BOOK/cross-tools/64/eglibc.xml | 8 ++++++
BOOK/cross-tools/alpha/eglibc-headers.xml | 8 ++++++
BOOK/cross-tools/alpha/eglibc.xml | 8 ++++++
BOOK/cross-tools/common/eglibc.xml | 8 ++++++
BOOK/cross-tools/mips/eglibc.xml | 8 ++++++
BOOK/cross-tools/mips64-64/eglibc.xml | 8 ++++++
BOOK/cross-tools/mips64/eglibc-64bit.xml | 8 ++++++
BOOK/cross-tools/mips64/eglibc-n32.xml | 8 ++++++
BOOK/cross-tools/mips64/eglibc.xml | 8 ++++++
BOOK/cross-tools/multilib/eglibc-64bit.xml | 8 ++++++
BOOK/cross-tools/multilib/eglibc.xml | 8 ++++++
BOOK/cross-tools/ppc/eglibc.xml | 8 ++++++
BOOK/cross-tools/ppc64/eglibc-64bit.xml | 8 ++++++
BOOK/cross-tools/ppc64/eglibc.xml | 8 ++++++
BOOK/cross-tools/sparc64-64/eglibc.xml | 8 ++++++
BOOK/cross-tools/sparc64/eglibc-64bit.xml | 8 ++++++
BOOK/cross-tools/sparc64/eglibc.xml | 8 ++++++
BOOK/cross-tools/x86/eglibc.xml | 8 ++++++
BOOK/cross-tools/x86_64/eglibc.xml | 8 ++++++
BOOK/final-system/alpha/eglibc.xml | 8 ++++++
BOOK/final-system/common/eglibc.xml | 5 ++++
BOOK/final-system/mips/eglibc.xml | 8 ++++++
BOOK/final-system/mips64-64/eglibc.xml | 8 ++++++
BOOK/final-system/mips64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/mips64/eglibc-n32.xml | 8 ++++++
BOOK/final-system/mips64/eglibc.xml | 8 ++++++
BOOK/final-system/multilib/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/multilib/eglibc.xml | 8 ++++++
BOOK/final-system/ppc/eglibc.xml | 8 ++++++
BOOK/final-system/ppc64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/ppc64/eglibc.xml | 8 ++++++
BOOK/final-system/sparc64-64/eglibc.xml | 8 ++++++
BOOK/final-system/sparc64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/x86/eglibc.xml | 8 ++++++
BOOK/final-system/x86_64-64/eglibc.xml | 8 ++++++
BOOK/final-system/x86_64/eglibc-64bit.xml | 8 ++++++
BOOK/final-system/x86_64/eglibc.xml | 8 ++++++
BOOK/introduction/common/changelog.xml | 4 +++
BOOK/materials/common/patches.xml | 9 +++++++
BOOK/packages.ent | 3 +-
BOOK/patches.ent | 4 +++
.../eglibc-2.12-20100725-r11059-make382-1.patch | 24 ++++++++++++++++++++
42 files changed, 336 insertions(+), 1 deletions(-)
create mode 100644 patches/eglibc-2.12-20100725-r11059-make382-1.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list