[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-176-g877cfcd
git
git at clfs.org
Sat Oct 17 15:01:52 PDT 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, sysvinit has been updated
via 877cfcd741be96710bce11582a2b6911ae4f770b (commit)
from 65db39dfa518f2126b2d2e2a13ea7132339e38ea (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 877cfcd741be96710bce11582a2b6911ae4f770b
Author: William Harrington <kb0iic at berzerkula.org>
Date: Sat Oct 17 17:01:41 2015 -0500
Update GLIBC from 2.21 to 2.22 and remove rttldir from config.cache.
diff --git a/BOOK/cross-tools/64/glibc.xml b/BOOK/cross-tools/64/glibc.xml
index 0939992..3b4a9f1 100644
--- a/BOOK/cross-tools/64/glibc.xml
+++ b/BOOK/cross-tools/64/glibc.xml
@@ -36,14 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='de'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
@@ -52,7 +44,7 @@
--host=${CLFS_TARGET} --build=${CLFS_HOST} \
--disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+ --enable-obsolete-rpc</userinput></screen>
<variablelist os="dg">
<title>The meaning of the new configure options:</title>
@@ -93,10 +85,6 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='dg9'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg10'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/cross-tools/common/glibc.xml b/BOOK/cross-tools/common/glibc.xml
index bfba96f..e03ad0b 100644
--- a/BOOK/cross-tools/common/glibc.xml
+++ b/BOOK/cross-tools/common/glibc.xml
@@ -34,11 +34,6 @@
href="../../final-system/common/glibc.xml"
xpointer="xpointer(//*[@os='f'])"/>
- <para os="dd">Add the following to <filename>config.cache</filename>
- to disable ssp when building Glibc:</para>
-
-<screen os="de"><userinput>echo "libc_cv_ssp=no" > config.cache</userinput></screen>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
@@ -49,7 +44,7 @@
--host=${CLFS_TARGET} --build=${CLFS_HOST} \
--disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+ --enable-obsolete-rpc</userinput></screen>
<variablelist os="dg">
<title>The meaning of the new configure options:</title>
@@ -128,13 +123,6 @@
</listitem>
</varlistentry>
- <varlistentry os="dg10">
- <term><parameter>--cache-file=config.cache</parameter></term>
- <listitem>
- <para>This tells Glibc to utilize a premade cache file.</para>
- </listitem>
- </varlistentry>
-
</variablelist>
<para os="dh">During this stage the following warning might appear:</para>
diff --git a/BOOK/cross-tools/mips64/glibc-n32.xml b/BOOK/cross-tools/mips64/glibc-n32.xml
index c6a0ce2..d7d858c 100644
--- a/BOOK/cross-tools/mips64/glibc-n32.xml
+++ b/BOOK/cross-tools/mips64/glibc-n32.xml
@@ -34,19 +34,10 @@
href="../multilib/glibc.xml"
xpointer="xpointer(//*[@os='f'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/glibc.xml"
- xpointer="xpointer(//*[@os='de'])"/>
-
<para os="n1">Configure Glibc to install its 32-bit libraries into <filename
class="directory">/tools/lib32</filename>:</para>
-<screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib32" >> config.cache
-echo "libc_cv_slibdir=/tools/lib32" >> config.cache</userinput></screen>
+<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib32" >> config.cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../multilib/glibc.xml"
diff --git a/BOOK/cross-tools/multilib/glibc-64bit.xml b/BOOK/cross-tools/multilib/glibc-64bit.xml
index 33ba7fa..980e945 100644
--- a/BOOK/cross-tools/multilib/glibc-64bit.xml
+++ b/BOOK/cross-tools/multilib/glibc-64bit.xml
@@ -34,19 +34,10 @@
href="glibc.xml"
xpointer="xpointer(//*[@os='f'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="glibc.xml"
- xpointer="xpointer(//*[@os='de'])"/>
-
<para os="n1">Configure Glibc to install its 64-bit libraries into <filename
class="directory">/tools/lib64</filename>:</para>
-<screen os="n2"><userinput>echo "libc_cv_rtlddir=/tools/lib64" >> config.cache
-echo "libc_cv_slibdir=/tools/lib64" >> config.cache</userinput></screen>
+<screen os="n2"><userinput>echo "libc_cv_slibdir=/tools/lib64" >> config.cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="glibc.xml"
diff --git a/BOOK/cross-tools/multilib/glibc.xml b/BOOK/cross-tools/multilib/glibc.xml
index d085a08..f31aecf 100644
--- a/BOOK/cross-tools/multilib/glibc.xml
+++ b/BOOK/cross-tools/multilib/glibc.xml
@@ -36,14 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='de'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
@@ -52,7 +44,7 @@
--host=${CLFS_TARGET32} --build=${CLFS_HOST} \
--disable-profile --enable-kernel=&glibc-kernel-version; \
--with-binutils=/cross-tools/bin --with-headers=/tools/include \
- --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+ --enable-obsolete-rpc</userinput></screen>
<variablelist os="dg">
<title>The meaning of the new configure options:</title>
@@ -97,10 +89,6 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='dg9'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dg10'])"/>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/cross-tools/sparc64-64/glibc.xml b/BOOK/cross-tools/sparc64-64/glibc.xml
index 54107fc..b3df68f 100644
--- a/BOOK/cross-tools/sparc64-64/glibc.xml
+++ b/BOOK/cross-tools/sparc64-64/glibc.xml
@@ -36,14 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64/glibc-64bit.xml"
- xpointer="xpointer(//*[@os='de'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/cross-tools/sparc64/glibc-64bit.xml b/BOOK/cross-tools/sparc64/glibc-64bit.xml
index 5a52b4b..961f830 100644
--- a/BOOK/cross-tools/sparc64/glibc-64bit.xml
+++ b/BOOK/cross-tools/sparc64/glibc-64bit.xml
@@ -34,16 +34,13 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='f'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/glibc.xml"
- xpointer="xpointer(//*[@os='dd'])"/>
+ <para os="dd">Add the following variables to <filename>config.cache</filename> so they are set properly:</para>
<screen os="de"><userinput>cat > config.cache << "EOF"
libc_cv_forced_unwind=yes
libc_cv_c_cleanup=yes
libc_cv_sparc64_tls=yes
libc_cv_gnu89_inline=yes
-libc_cv_ssp=no
EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/mips64-64/glibc.xml b/BOOK/final-system/mips64-64/glibc.xml
index 10b8ab9..a78bb88 100644
--- a/BOOK/final-system/mips64-64/glibc.xml
+++ b/BOOK/final-system/mips64-64/glibc.xml
@@ -53,6 +53,14 @@
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/multilib/glibc-64bit.xml b/BOOK/final-system/multilib/glibc-64bit.xml
index 73b9def..80a62cb 100644
--- a/BOOK/final-system/multilib/glibc-64bit.xml
+++ b/BOOK/final-system/multilib/glibc-64bit.xml
@@ -45,8 +45,7 @@ unset LINKER</userinput></screen>
<para os="m1">Configure Glibc to install its 64-bit libraries into
<filename class="directory">/lib64</filename>:</para>
-<screen os="m2"><userinput>echo "libc_cv_rtlddir=/lib64" >> config.cache
-echo "libc_cv_slibdir=/lib64" >> config.cache</userinput></screen>
+<screen os="m2"><userinput>echo "libc_cv_slibdir=/lib64" >> config.cache</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="glibc.xml"
diff --git a/BOOK/final-system/ppc64-64/glibc.xml b/BOOK/final-system/ppc64-64/glibc.xml
index 8f98e5a..5af28bb 100644
--- a/BOOK/final-system/ppc64-64/glibc.xml
+++ b/BOOK/final-system/ppc64-64/glibc.xml
@@ -54,6 +54,14 @@
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'])"/>
@@ -118,18 +126,9 @@
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='t'])"/>
- <para>Now we can remove this symlink. We also need to correct the <command>
- /usr/bin/ldd</command> script - if you look at this, you will see it references
- not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
- is. The following <command>sed</command> will correct this:</para>
-
- <screen><userinput>rm -v /lib/ld.so.1
-sed -i.bak '/RTLDLIST/s%/ld.so.1 /lib64%%' /usr/bin/ldd</userinput></screen>
-
- <para>Check the script to make sure the sed worked correctly, then delete
- the backup.</para>
+ <para>Now we can remove this symlink:</para>
- <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+ <screen><userinput>rm -v /lib/ld.so.1</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
diff --git a/BOOK/final-system/sparc64-64/glibc.xml b/BOOK/final-system/sparc64-64/glibc.xml
index fd84ae9..80ddf85 100644
--- a/BOOK/final-system/sparc64-64/glibc.xml
+++ b/BOOK/final-system/sparc64-64/glibc.xml
@@ -62,6 +62,14 @@
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 9ae11f4..4189a65 100644
--- a/BOOK/final-system/x86_64-64/glibc.xml
+++ b/BOOK/final-system/x86_64-64/glibc.xml
@@ -48,8 +48,13 @@
<para os="l5">Configure Glibc to install its libraries into
<filename class="directory">/lib</filename>:</para>
-<screen os="l6"><userinput>echo "libc_cv_rtlddir=/lib" >> config.cache
-echo "libc_cv_slibdir=/lib" >> config.cache</userinput></screen>
+<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"
@@ -126,18 +131,9 @@ echo "libc_cv_slibdir=/lib" >> config.cache</userinput></screen>
href="../common/glibc.xml"
xpointer="xpointer(//*[@os='t'])"/>
- <para>Now we can remove this symlink. We also need to correct the <command>
- /usr/bin/ldd</command> script - if you look at this, you will see it references
- not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
- is. The following <command>sed</command> will correct this:</para>
-
- <screen><userinput>rm -v /lib/ld-linux.so.2
-sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
-
- <para>Check the script to make sure the sed worked correctly, then delete
- the backup.</para>
+ <para>Now we can remove this symlink:</para>
- <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+ <screen><userinput>rm -v /lib/ld-linux.so.2</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/glibc.xml"
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index a742d94..d914aa9 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -177,10 +177,10 @@
<!ENTITY gettext-md5 "69d79254ee3b41df23f41c2f4fd720d9">
<!ENTITY gettext-home "&gnu-software;gettext">
-<!ENTITY glibc-version "2.20">
-<!ENTITY glibc-size "12,284 KB">
+<!ENTITY glibc-version "2.22">
+<!ENTITY glibc-size "12,969 KB">
<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "948a6e06419a01bd51e97206861595b0">
+<!ENTITY glibc-md5 "e51e02bf552a0a1fbbdc948fb2f5e83c">
<!ENTITY glibc-home "&gnu-software;libc/">
<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
<!ENTITY glibc-kernel-version "2.6.32">
-----------------------------------------------------------------------
Summary of changes:
BOOK/cross-tools/64/glibc.xml | 14 +-------------
BOOK/cross-tools/common/glibc.xml | 14 +-------------
BOOK/cross-tools/mips64/glibc-n32.xml | 11 +----------
BOOK/cross-tools/multilib/glibc-64bit.xml | 11 +----------
BOOK/cross-tools/multilib/glibc.xml | 14 +-------------
BOOK/cross-tools/sparc64-64/glibc.xml | 8 --------
BOOK/cross-tools/sparc64/glibc-64bit.xml | 5 +----
BOOK/final-system/mips64-64/glibc.xml | 8 ++++++++
BOOK/final-system/multilib/glibc-64bit.xml | 3 +--
BOOK/final-system/ppc64-64/glibc.xml | 21 ++++++++++-----------
BOOK/final-system/sparc64-64/glibc.xml | 8 ++++++++
BOOK/final-system/x86_64-64/glibc.xml | 22 +++++++++-------------
BOOK/packages.ent | 6 +++---
13 files changed, 45 insertions(+), 100 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list