[Clfs-commits] commit: r3981 - in /trunk/BOOK: final-system/ final-system/common/ final-system/mips/ final-system/mips64-64/ final-system/mips64/ final-system/multilib/ final-system/ppc/ final-system/ppc64/ final-system/x86_64-64/ final-system/x86_64/ introduction/common/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Aug 24 06:44:46 PDT 2008
Author: jciccone
Date: Sun Aug 24 13:44:45 2008
New Revision: 3981
Log:
Update the path to ld.so when configuring Glibc for each arch.
Added:
trunk/BOOK/final-system/ppc/glibc.xml
- copied, changed from r3978, trunk/BOOK/final-system/common/glibc.xml
trunk/BOOK/final-system/ppc64/glibc-64bit.xml
- copied, changed from r3978, trunk/BOOK/final-system/multilib/glibc-64bit.xml
Modified:
trunk/BOOK/final-system/common/glibc.xml
trunk/BOOK/final-system/mips/glibc.xml
trunk/BOOK/final-system/mips64-64/glibc.xml
trunk/BOOK/final-system/mips64/glibc-64bit.xml
trunk/BOOK/final-system/multilib/glibc-64bit.xml
trunk/BOOK/final-system/ppc-chapter.xml
trunk/BOOK/final-system/ppc64-chapter.xml
trunk/BOOK/final-system/x86_64-64/glibc.xml
trunk/BOOK/final-system/x86_64/glibc-64bit.xml
trunk/BOOK/introduction/common/changelog.xml
Modified: trunk/BOOK/final-system/common/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/common/glibc.xml (original)
+++ trunk/BOOK/final-system/common/glibc.xml Sun Aug 24 13:44:45 2008
@@ -267,7 +267,7 @@
<primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
</indexterm>
- <para>By default, the dynamic loader (<filename
+ <para os="ld-a">By default, the dynamic loader (<filename
class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
<filename class="directory">/lib</filename> and <filename
class="directory">/usr/lib</filename> for dynamic libraries that are
@@ -281,10 +281,10 @@
class="directory">/opt/lib</filename>, so add those directories to the
dynamic loader's search path.</para>
- <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
+ <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
following:</para>
-<screen><userinput>cat > /etc/ld.so.conf << "EOF"
+<screen os="ld-c"><userinput>cat > /etc/ld.so.conf << "EOF"
<literal># Begin /etc/ld.so.conf
/usr/local/lib
Modified: trunk/BOOK/final-system/mips/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/mips/glibc.xml (original)
+++ trunk/BOOK/final-system/mips/glibc.xml Sun Aug 24 13:44:45 2008
@@ -128,7 +128,7 @@
xpointer="xpointer(id('conf-glibc'))"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/glibc.xml"
+ href="../ppc/glibc.xml"
xpointer="xpointer(id('conf-ld'))"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: trunk/BOOK/final-system/mips64-64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-64/glibc.xml (original)
+++ trunk/BOOK/final-system/mips64-64/glibc.xml Sun Aug 24 13:44:45 2008
@@ -150,7 +150,7 @@
xpointer="xpointer(id('conf-glibc'))"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/glibc.xml"
+ href="../mips/glibc.xml"
xpointer="xpointer(id('conf-ld'))"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Modified: trunk/BOOK/final-system/mips64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/mips64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/mips64/glibc-64bit.xml Sun Aug 24 13:44:45 2008
@@ -136,8 +136,11 @@
<primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
</indexterm>
- <para>By default, the dynamic loader (<filename
- class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
+ <para os="ld-a">By default, the dynamic loader (<filename
+ class="libraryfile">/lib/ld.so.1</filename> for 32bit executables <filename
+ class="libraryfile">/lib32/ld.so.1</filename> for n32 executables and
+ <filename class="libraryfile">/lib64/ld.so.1</filename> for 64bit
+ executables) searches through
<filename class="directory">/lib</filename> and <filename
class="directory">/usr/lib</filename> for dynamic libraries that are
needed by programs as they are run. However, if there are libraries in
@@ -154,10 +157,10 @@
and <filename class="directory">/opt/lib64</filename>,
so add those directories to the dynamic loader's search path.</para>
- <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
+ <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
following:</para>
-<screen><userinput>cat > /etc/ld.so.conf << "EOF"
+<screen os="ld-c"><userinput>cat > /etc/ld.so.conf << "EOF"
<literal># Begin /etc/ld.so.conf
/usr/local/lib
Modified: trunk/BOOK/final-system/multilib/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/glibc-64bit.xml Sun Aug 24 13:44:45 2008
@@ -130,8 +130,10 @@
<primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
</indexterm>
- <para>By default, the dynamic loader (<filename
- class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
+ <para os="ld-a">By default, the dynamic loader (<filename
+ class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
+ <filename class="libraryfile">/lib64/ld-linux.so.2</filename> for
+ 64bit executables) searches through
<filename class="directory">/lib</filename>,
<filename class="directory">/lib64</filename>,
<filename class="directory">/usr/lib</filename>,
@@ -147,10 +149,10 @@
and <filename class="directory">/opt/lib64</filename>,
so add those directories to the dynamic loader's search path.</para>
- <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
+ <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
following:</para>
-<screen><userinput>cat > /etc/ld.so.conf << "EOF"
+<screen os="ld-c"><userinput>cat > /etc/ld.so.conf << "EOF"
<literal># Begin /etc/ld.so.conf
/usr/local/lib
Modified: trunk/BOOK/final-system/ppc-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc-chapter.xml Sun Aug 24 13:44:45 2008
@@ -17,7 +17,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/glibc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/adjusting.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
Modified: trunk/BOOK/final-system/ppc64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc64-chapter.xml Sun Aug 24 13:44:45 2008
@@ -18,7 +18,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/adjusting.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/binutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/gcc.xml"/>
Modified: trunk/BOOK/final-system/x86_64-64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-64/glibc.xml (original)
+++ trunk/BOOK/final-system/x86_64-64/glibc.xml Sun Aug 24 13:44:45 2008
@@ -157,9 +157,36 @@
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'))"/>
+ <sect2 id="conf-ld" role="configuration">
+ <title>Configuring The Dynamic Loader</title>
+
+ <indexterm zone="conf-ld">
+ <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
+ </indexterm>
+
+ <para>By default, the dynamic loader (<filename
+ class="libraryfile">/lib/ld-linux-x86-64.so.2</filename>) searches through
+ <filename class="directory">/lib</filename> and <filename
+ class="directory">/usr/lib</filename> for dynamic libraries that are
+ needed by programs as they are run. However, if there are libraries in
+ directories other than <filename class="directory">/lib</filename> and
+ <filename class="directory">/usr/lib</filename>, these need to be
+ added to the <filename>/etc/ld.so.conf</filename> file in order
+ 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> and <filename
+ class="directory">/opt/lib</filename>, so add those directories to the
+ dynamic loader's search path.</para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/glibc.xml"
+ xpointer="xpointer(//*[@os='ld-b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/glibc.xml"
+ xpointer="xpointer(//*[@os='ld-c'])"/>
+
+ </sect2>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/glibc.xml"
Modified: trunk/BOOK/final-system/x86_64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/x86_64/glibc-64bit.xml Sun Aug 24 13:44:45 2008
@@ -117,9 +117,41 @@
href="../common/glibc.xml"
xpointer="xpointer(id('conf-glibc'))"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../multilib/glibc-64bit.xml"
- xpointer="xpointer(id('conf-ld'))"/>
+ <sect2 id="conf-ld" role="configuration">
+ <title>Configuring The Dynamic Loader</title>
+
+ <indexterm zone="conf-ld">
+ <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
+ </indexterm>
+
+ <para>By default, the dynamic loader (<filename
+ class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
+ <filename class="libraryfile">/lib64/ld-linux-x86-64.so.2</filename> for
+ 64bit executables) searches through
+ <filename class="directory">/lib</filename>,
+ <filename class="directory">/lib64</filename>,
+ <filename class="directory">/usr/lib</filename>,
+ and <filename class="directory">/usr/lib64</filename> for dynamic
+ libraries that are needed by programs as they are run. However, if
+ there are libraries in directories other than these, they need to be
+ added to the <filename>/etc/ld.so.conf</filename> file in order
+ for the dynamic loader to find them. Some directories that are commonly
+ known to contain additional libraries are
+ <filename class="directory">/usr/local/lib</filename>,
+ <filename class="directory">/usr/local/lib64</filename>,
+ <filename class="directory">/opt/lib</filename>,
+ and <filename class="directory">/opt/lib64</filename>,
+ so add those directories to the dynamic loader's search path.</para>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../multilib/glibc-64bit.xml"
+ xpointer="xpointer(//*[@os='ld-b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../multilib/glibc-64bit.xml"
+ xpointer="xpointer(//*[@os='ld-c'])"/>
+
+ </sect2>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/glibc.xml"
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sun Aug 24 13:44:45 2008
@@ -35,6 +35,16 @@
</itemizedlist>
</listitem>
-->
+
+ <listitem>
+ <para>August 24, 2008</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Update the paths to ld.so when configuring Glibc
+ for each arch.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>July 13, 2008</para>
More information about the Clfs-commits
mailing list