Changeset 026bb5d for BOOK/final-system/mips64/eglibc-64bit.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/mips64/eglibc-64bit.xml (modified) (2 diffs)

BOOK/final-system/mips64/eglibc-64bit.xml

@@ -39 +39 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <para os="m3">The following will cause EGLIBC to use an absolute path to the
@@ -63 +47 @@
 <screen os="m4"><userinput>cp -v config.make.in{,.orig}
 sed '/ldd-rewrite-script/s:@:${objdir}/&amp;:' config.make.in.orig &gt; config.make.in</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"