[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-3.0.0-systemd-213-gbb6f135
git
git at clfs.org
Sat Dec 5 10:12:27 PST 2015
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 bb6f1356bb39fe6544cda5360da4f46661bd9b01 (commit)
via da472431bb3b0e7fe798a55f8388abba105a1d31 (commit)
from cc9f07c77f30550d6b99f1952bbf20dab743df98 (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 bb6f1356bb39fe6544cda5360da4f46661bd9b01
Author: Chris Staub <chris at beaker67.com>
Date: Sat Dec 5 15:03:11 2015 -0500
Fixed Glibc instructions by moving command to edit ldd-rewrite script
diff --git a/BOOK/final-system/mips64-64/glibc.xml b/BOOK/final-system/mips64-64/glibc.xml
index 81d46de..83bc826 100644
--- a/BOOK/final-system/mips64-64/glibc.xml
+++ b/BOOK/final-system/mips64-64/glibc.xml
@@ -34,6 +34,14 @@
xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l4'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
@@ -53,14 +61,6 @@
href="../x86_64-64/glibc.xml"
xpointer="xpointer(//*[@os='l6'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l8'])"/>
-
<para>Now we will force Glibc to build as 64-bit instead of the default
n32 with the following sed:</para>
diff --git a/BOOK/final-system/ppc64-64/glibc.xml b/BOOK/final-system/ppc64-64/glibc.xml
index 186f523..93a3306 100644
--- a/BOOK/final-system/ppc64-64/glibc.xml
+++ b/BOOK/final-system/ppc64-64/glibc.xml
@@ -34,6 +34,14 @@
xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l4'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
@@ -54,14 +62,6 @@
xpointer="xpointer(//*[@os='l6'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l8'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
diff --git a/BOOK/final-system/sparc64-64/glibc.xml b/BOOK/final-system/sparc64-64/glibc.xml
index 580f746..1f6db0b 100644
--- a/BOOK/final-system/sparc64-64/glibc.xml
+++ b/BOOK/final-system/sparc64-64/glibc.xml
@@ -34,6 +34,14 @@
xpointer="xpointer(//*[@os='l2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/glibc.xml"
+ xpointer="xpointer(//*[@os='l4'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
@@ -62,14 +70,6 @@
xpointer="xpointer(//*[@os='l6'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l7'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64-64/glibc.xml"
- xpointer="xpointer(//*[@os='l8'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
diff --git a/BOOK/final-system/x86_64-64/glibc.xml b/BOOK/final-system/x86_64-64/glibc.xml
index 4c923f5..008f3b4 100644
--- a/BOOK/final-system/x86_64-64/glibc.xml
+++ b/BOOK/final-system/x86_64-64/glibc.xml
@@ -33,6 +33,12 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='l2'])"/>
+ <para os="l3">Modify the <command>ldd</command> rewrite script to remove
+ <filename class="directory">lib64</filename> and
+ <filename class="directory">libx32</filename> from RTLDLIST.</para>
+
+<screen os="l4"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='b'])"/>
@@ -50,12 +56,6 @@
<screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" >> config.cache</userinput></screen>
- <para os="l7">Modify the <command>ldd</command> rewrite script to remove
- <filename class="directory">lib64</filename> and
- <filename class="directory">libx32</filename> from RTLDLIST.</para>
-
-<screen os="l8"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
commit da472431bb3b0e7fe798a55f8388abba105a1d31
Author: Chris Staub <chris at beaker67.com>
Date: Sat Dec 5 15:01:09 2015 -0500
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 3df9269..287351b 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "11"> <!-- Use two digits -->
-<!ENTITY month_name "November">
-<!ENTITY day "30"> <!-- Use two digits -->
+<!ENTITY month "12"> <!-- Use two digits -->
+<!ENTITY month_name "December">
+<!ENTITY day "05"> <!-- Use two digits -->
<!ENTITY year "2015"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/mips64-64/glibc.xml | 16 ++++++++--------
BOOK/final-system/ppc64-64/glibc.xml | 16 ++++++++--------
BOOK/final-system/sparc64-64/glibc.xml | 16 ++++++++--------
BOOK/final-system/x86_64-64/glibc.xml | 12 ++++++------
BOOK/general.ent | 6 +++---
5 files changed, 33 insertions(+), 33 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list