Changeset d19bda6

Timestamp:

Dec 5, 2015, 8:06:45 PM (9 years ago)

Author:

Chris Staub <chris@…>

Branches:

sysvinit

Children:

fed4842

Parents:

0ffb323

git-author:

Chris Staub <chris@…> (12/05/15 20:03:11)

git-committer:

Chris Staub <chris@…> (12/05/15 20:06:45)

Message:

Fixed Glibc instructions by moving command to edit ldd-rewrite script

Location:

BOOK/final-system

Files:

• mips64-64/glibc.xml (modified) (2 diffs)
• ppc64-64/glibc.xml (modified) (2 diffs)
• sparc64-64/glibc.xml (modified) (2 diffs)
• x86_64-64/glibc.xml (modified) (2 diffs)

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

@@ -35 +35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -53 +61 @@
     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

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

@@ -35 +35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -53 +61 @@
     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'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -35 +35 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/glibc.xml"
+    xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -61 +69 @@
     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'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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>
+
+<screen os="l4"><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"
@@ -50 +56 @@
 
 <screen os="l6"><userinput>echo "libc_cv_slibdir=/lib" &gt;&gt; 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"