Changeset 663f8a7 for BOOK/temp-system

Timestamp:

Feb 20, 2009, 7:37:50 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f6f0d18

Parents:

987e04d7

Message:

Updated Bash 4.0

Location:

BOOK/temp-system

Files:

• common/bash.xml (modified) (5 diffs)
• multilib/bash.xml (modified) (3 diffs)

BOOK/temp-system/common/bash.xml

@@ -23 +23 @@
     <title>Installation of Bash</title>
 
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
@@ -30 +31 @@
     href="../../final-system/common/bash.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
-    <para os="c1">When bash is cross-compiled, it cannot test for the presence
+    <para os="t1">When bash is cross-compiled, it cannot test for the presence
     of named pipes, amoung other things. If you used <command>su</command> to
     become an unprivileged user, this combination will cause Bash to build
@@ -39 +41 @@
     or that do not run properly:</para>
 
-<screen os="c2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
+<screen os="t2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
 ac_cv_func_mmap_fixed_mapped=yes
 ac_cv_func_strcoll_works=yes
@@ -56 +58 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="h"><userinput>./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     --without-bash-malloc --cache-file=config.cache</userinput></screen>
 
-    <variablelist os="ad">
+    <variablelist os="c">
       <title>The meaning of the configure option:</title>
 
@@ -79 +81 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="n"><userinput>make install</userinput></screen>
+<screen os="h"><userinput>make install</userinput></screen>
 
-    <para os="ae">Make a link for programs that use <command>sh</command> for
+    <para os="t3">Make a link for programs that use <command>sh</command> for
     a shell:</para>
 
-<screen os="af"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
+<screen os="t4"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
 
   </sect2>

BOOK/temp-system/multilib/bash.xml

@@ -23 +23 @@
     <title>Installation of Bash</title>
 
+<!--
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
@@ -30 +31 @@
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
+    xpointer="xpointer(//*[@os='t1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
+    xpointer="xpointer(//*[@os='t2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    ./configure --prefix=/tools \
    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
@@ -50 +52 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='t3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='t4'])"/>
 
   </sect2>