Author: jim
Date: 2005-09-28 08:54:53 -0600 (Wed, 28 Sep 2005)
New Revision: 6907
Added:
branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
Modified:
branches/cross-lfs/BOOK/
branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
branches/cross-lfs/BOOK/final-system/mips/glibc.xml
branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
branches/cross-lfs/BOOK/final-system/mips64/glibc.xml
Log:
[EMAIL PROTECTED]: jim | 2005-09-28 07:54:11 -0700
Clean-ups for NPTL update
Property changes on: branches/cross-lfs/BOOK
___________________________________________________________________
Name: svk:merge
- 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7511
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
+ 7321b066-45f8-0310-a5e2-f63eff31be55:/cross-lfs:7513
dfc39d96-41f8-0310-9e44-b84af8e7c7f6:/books/local:5516
Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-64bit.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -55,16 +55,16 @@
href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'dc'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc-n32.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -55,16 +55,16 @@
href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'dc'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/cross-tools/mips64/glibc.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -55,16 +55,16 @@
href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'dc'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/final-system/mips/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips/glibc.xml 2005-09-28 06:24:34 UTC
(rev 6906)
+++ branches/cross-lfs/BOOK/final-system/mips/glibc.xml 2005-09-28 14:54:53 UTC
(rev 6907)
@@ -50,16 +50,16 @@
href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-64bit.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -50,16 +50,16 @@
href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<para>Now we make sure the Glibc goes into
@@ -176,8 +176,10 @@
for the dynamic loader to find them. Two directories that are commonly
known to contain additional libraries are
<filename class="directory">/usr/local/lib</filename>,
+ <filename class="directory">/usr/local/lib32</filename>,
<filename class="directory">/usr/local/lib64</filename>,
<filename class="directory">/opt/lib</filename>,
+ <filename class="directory">/opt/lib32</filename>,
and <filename class="directory">/opt/lib64</filename>,
so add those directories to the dynamic loader's search path.</para>
@@ -188,8 +190,10 @@
<literal># Begin /etc/ld.so.conf
/usr/local/lib
+/usr/local/lib32
/usr/local/lib64
/opt/lib
+/opt/lib32
/opt/lib64
# End /etc/ld.so.conf</literal>
Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc-n32.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -50,16 +50,16 @@
href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<para>Now we make sure the Glibc goes into
Modified: branches/cross-lfs/BOOK/final-system/mips64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/mips64/glibc.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/final-system/mips64/glibc.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -51,16 +51,16 @@
href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../common/glibc.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-
<para>This patch will add NPTL support to MIPS, this will allow us to use
NPTL:</para>
<screen><userinput>patch -Np1 -i
../&glibc-mips_nptl-patch;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
Added: branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml 2005-09-28
06:24:34 UTC (rev 6906)
+++ branches/cross-lfs/BOOK/final-system/x86_64-64/glibc.xml 2005-09-28
14:54:53 UTC (rev 6907)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ <!ENTITY % patches-entities SYSTEM "../../patches.ent">
+ %general-entities;
+ %patches-entities;
+]>
+
+<sect1 id="ch-system-glibc" role="wrap">
+ <?dbhtml filename="glibc.html"?>
+
+ <title>Glibc-&glibc-version;</title>
+
+ <indexterm zone="ch-system-glibc">
+ <primary sortas="a-Glibc">Glibc</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'package']/para[1])"/>
+
+ <segmentedlist>
+ <segtitle>&buildtime;</segtitle>
+ <segtitle>&diskspace;</segtitle>
+
+ <seglistitem>
+ <seg>Not checked yet</seg>
+ <seg>Not checked yet</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'package']/segmentedlist[2])"/>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of Glibc</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'f'])"/>
+
+ <para>Now we make sure the Glibc goes into
+ <filename class="directory">/lib</filename>:</para>
+
+<screen><userinput>echo "slibdir=/lib" >>
configparms</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'g'])"/>
+
+<screen><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
+ --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
+ --libexecdir=/usr/lib/glibc --libdir=/usr/lib</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the new configure option:</title>
+
+ <varlistentry>
+ <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
+ <listitem>
+ <para>This changes the location of the <command>pt_chown</command>
+ program from its default of <filename
+ class="directory">/usr/libexec</filename> to <filename
+ class="directory">/usr/lib64/glibc</filename>.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'j'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'k'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'l'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'m'])"/>
+
+ <!-- test comments from 64bit which is clean -->
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../multilib/glibc-64bit.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'n'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'q'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'r'])"/>
+
+ <para>The install will finish by checking that everything is correctly
installed.
+ Unfortunately, it will test for a multilib installation. On common this
means
+ it will try to test the non-existent 32-bit loader which has a different
name
+ from the 64-bit loader (unlike on other 64-bit architectures). We fool it
by
+ creating a symlink to the real loader.</para>
+
+ <screen><userinput>ln -s ld-2.3.90.so
/lib/ld-linux.so.2</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'s'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(//[EMAIL PROTECTED]'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 /lib/ld-linux.so.2
+ cp /usr/bin/ldd{,.bak}
+ sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd
+ </userinput></screen>
+
+ <para>Check the script to make sure the sed worked correctly, then delete
+ the backup.</para>
+
+ <screen><userinput>rm /usr/bin/ldd.bak</userinput></screen>
+
+ </sect2>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(id('i18n-glibc'))"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(id('conf-glibc'))"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(id('conf-ld'))"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
+ href="../common/glibc.xml"
+ xpointer="xpointer(id('contents-glibc'))"/>
+
+</sect1>
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
