Changeset 026bb5d for BOOK/final-system/multilib/coreutils.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/multilib/coreutils.xml (modified) (2 diffs)

BOOK/final-system/multilib/coreutils.xml

@@ -34 +34 @@
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+<screen os="d"><userinput>FORCE_UNSAFE_CONFIGURE=1 CC="gcc ${BUILD64}" \
+   ./configure --prefix=/usr \
     --enable-no-install-program=kill,uptime \
     --enable-install-program=hostname</userinput></screen>
+    
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/coreutils.xml"
+    xpointer="xpointer(//*[@os='d1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -106 +111 @@
     xpointer="xpointer(//*[@os='u'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
   </sect2>