Changeset 991595cf for BOOK/final-system/x86_64-64/glibc.xml

Timestamp:

Dec 14, 2015, 12:21:52 AM (9 years ago)

Author:

Chris Staub <chris@…>

Branches:

sysvinit

Children:

fc86858d

Parents:

dbc5b02 (diff), c7477f8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'sysvinit' of clfs.org:cross-lfs into sysvinit

File:

• BOOK/final-system/x86_64-64/glibc.xml (modified) (2 diffs)

BOOK/final-system/x86_64-64/glibc.xml

@@ -34 +34 @@
     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>
+    <para os="l3">Modify the <command>ldd</command> rewrite script to prevent
+    it from adding <filename class="directory">lib64</filename> and
+    <filename class="directory">libx32</filename> to its list of linker
+    search locations:</para>
 
 <screen os="l4"><userinput>sed -i '/RTLDLIST/d' sysdeps/unix/sysv/linux/*/ldd-rewrite.sed</userinput></screen>
@@ -61 +62 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=&glibc-kernel-version; \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
-    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+<screen os="h"><userinput>../glibc-&glibc-version;/configure \
+    --prefix=/usr \
+    --disable-profile \
+    --enable-kernel=&glibc-kernel-version; \
+    --libexecdir=/usr/lib/glibc \
+    --libdir=/usr/lib \
+    --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"