[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-352-g64e30c8
git
git at cross-lfs.org
Mon Sep 9 09:40:18 PDT 2013
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 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3 (commit)
via 69cbad1595654667c187826c4778a6cc338823ad (commit)
from b89349d3638f1a020fc930fbc0f16c9d2009eb9c (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 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Sep 9 11:40:13 2013 -0500
Remove stubs-64.h from eglibc pure64 bit installs. Should only have stubs.h in a pure64 bit environment.
diff --git a/BOOK/cross-tools/mips64-64/eglibc.xml b/BOOK/cross-tools/mips64-64/eglibc.xml
index 54a8115..4c1f1c8 100644
--- a/BOOK/cross-tools/mips64-64/eglibc.xml
+++ b/BOOK/cross-tools/mips64-64/eglibc.xml
@@ -90,6 +90,14 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='dn'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='do'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='dp'])"/>
+
</sect2>
<sect2 role="content">
diff --git a/BOOK/cross-tools/ppc64-64/eglibc.xml b/BOOK/cross-tools/ppc64-64/eglibc.xml
index 301b15a..9941377 100644
--- a/BOOK/cross-tools/ppc64-64/eglibc.xml
+++ b/BOOK/cross-tools/ppc64-64/eglibc.xml
@@ -132,11 +132,11 @@
xpointer="xpointer(//*[@os='dn'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64-64/eglibc.xml"
+ href="../x86_64-64/eglibc.xml"
xpointer="xpointer(//*[@os='do'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64-64/eglibc.xml"
+ href="../x86_64-64/eglibc.xml"
xpointer="xpointer(//*[@os='dp'])"/>
</sect2>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 31e194e..f45212f 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eglibc.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/ppc64-64/eglibc.xml b/BOOK/cross-tools/x86_64-64/eglibc.xml
similarity index 76%
copy from BOOK/cross-tools/ppc64-64/eglibc.xml
copy to BOOK/cross-tools/x86_64-64/eglibc.xml
index 301b15a..431412d 100644
--- a/BOOK/cross-tools/ppc64-64/eglibc.xml
+++ b/BOOK/cross-tools/x86_64-64/eglibc.xml
@@ -8,11 +8,11 @@
<sect1 id="ch-cross-tools-eglibc" role="wrap">
<?dbhtml filename="eglibc.html"?>
- <title>EGLIBC-&eglibc-version;</title>
+ <title>EGLIBC-&eglibc-version; 32 Bit</title>
<indexterm zone="ch-cross-tools-eglibc">
<primary sortas="a-EGLIBC">EGLIBC</primary>
- <secondary>cross tools</secondary>
+ <secondary>cross tools, 32 Bit</secondary>
</indexterm>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -46,13 +46,14 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
- AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
- ../eglibc-&eglibc-version;/configure --prefix=/tools \
- --host=${CLFS_TARGET} --build=${CLFS_HOST} \
- --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
- --with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+ AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+ CFLAGS="-march=$(cut -d- -f1 <<< $CLFS_TARGET32) -O2" \
+ ../eglibc-&eglibc-version;/configure --prefix=/tools \
+ --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
+ --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
+ --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+ --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
<variablelist os="dg">
<title>The meaning of the new configure options:</title>
@@ -62,8 +63,8 @@
xpointer="xpointer(//*[@os='dg1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/eglibc-64bit.xml"
- xpointer="xpointer(//*[@os='fa1'])"/>
+ href="../multilib/eglibc.xml"
+ xpointer="xpointer(//*[@os='ea1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
@@ -73,6 +74,14 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='dg4'])"/>
+ <varlistentry os="ea2">
+ <term><parameter>CFLAGS="-march=$(cut -d- -f1 <<<
+ $CLFS_TARGET32) -O2"</parameter></term>
+ <listitem>
+ <para>Forces EGLIBC to optimize for our target system.</para>
+ </listitem>
+ </varlistentry>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='dg5'])"/>
@@ -131,13 +140,11 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='dn'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64-64/eglibc.xml"
- xpointer="xpointer(//*[@os='do'])"/>
+ <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
+ and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
+ this with the following:</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64-64/eglibc.xml"
- xpointer="xpointer(//*[@os='dp'])"/>
+ <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
</sect2>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index 114bf26..9f35ce2 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
diff --git a/BOOK/final-system/mips64-64/eglibc.xml b/BOOK/final-system/mips64-64/eglibc.xml
index cb10dea..00c1561 100644
--- a/BOOK/final-system/mips64-64/eglibc.xml
+++ b/BOOK/final-system/mips64-64/eglibc.xml
@@ -131,6 +131,14 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='t'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='u'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='v'])"/>
+
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc64-64/eglibc.xml b/BOOK/final-system/ppc64-64/eglibc.xml
index e85feaf..1eaf6cd 100644
--- a/BOOK/final-system/ppc64-64/eglibc.xml
+++ b/BOOK/final-system/ppc64-64/eglibc.xml
@@ -140,12 +140,13 @@ sed '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></
<screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='u'])"/>
- <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
- and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
- this with the following:</para>
-
- <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='v'])"/>
</sect2>
diff --git a/BOOK/final-system/sparc64-64/eglibc.xml b/BOOK/final-system/sparc64-64/eglibc.xml
index 8cc9ffe..788017d 100644
--- a/BOOK/final-system/sparc64-64/eglibc.xml
+++ b/BOOK/final-system/sparc64-64/eglibc.xml
@@ -126,11 +126,13 @@
href="../common/eglibc.xml"
xpointer="xpointer(//*[@os='t'])"/>
- <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
- and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
- this with the following:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='u'])"/>
- <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/eglibc.xml"
+ xpointer="xpointer(//*[@os='v'])"/>
</sect2>
diff --git a/BOOK/final-system/x86_64-64/eglibc.xml b/BOOK/final-system/x86_64-64/eglibc.xml
index 7faf54f..dcc3ef3 100644
--- a/BOOK/final-system/x86_64-64/eglibc.xml
+++ b/BOOK/final-system/x86_64-64/eglibc.xml
@@ -148,6 +148,12 @@ sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userin
<screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+ <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
+ and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
+ this with the following:</para>
+
+ <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+
</sect2>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
commit 69cbad1595654667c187826c4778a6cc338823ad
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Sep 9 11:39:00 2013 -0500
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 4193439..b88fc61 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "09"> <!-- Use two digits -->
<!ENTITY month_name "September">
-<!ENTITY day "08"> <!-- Use two digits -->
+<!ENTITY day "09"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/cross-tools/mips64-64/eglibc.xml | 8 ++++++++
BOOK/cross-tools/ppc64-64/eglibc.xml | 4 ++--
BOOK/cross-tools/x86_64-64-chapter.xml | 2 +-
BOOK/cross-tools/{x86_64 => x86_64-64}/eglibc.xml | 6 ++++++
BOOK/cross-tools/x86_64-chapter.xml | 2 +-
BOOK/final-system/mips64-64/eglibc.xml | 8 ++++++++
BOOK/final-system/ppc64-64/eglibc.xml | 11 ++++++-----
BOOK/final-system/sparc64-64/eglibc.xml | 10 ++++++----
BOOK/final-system/x86_64-64/eglibc.xml | 6 ++++++
BOOK/general.ent | 2 +-
10 files changed, 45 insertions(+), 14 deletions(-)
copy BOOK/cross-tools/{x86_64 => x86_64-64}/eglibc.xml (94%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list