Changeset aa3ee8b for BOOK/temp-tools/multilib

Timestamp:

Feb 21, 2006, 1:25:05 AM (19 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:

06a21d1

Parents:

69caf2f

Message:

r783@server (orig r781): jim | 2005-11-30 22:29:11 -0800

r840@server: jim | 2005-11-30 22:28:43 -0800
Text updates to temp-tools

Location:

BOOK/temp-tools/multilib

Files:

• perl.xml (modified) (3 diffs)
• tcl-64bit.xml (modified) (2 diffs)
• texinfo.xml (modified) (1 diff)

BOOK/temp-tools/multilib/perl.xml

@@ -23 +23 @@
     <title>Installation of Perl</title>
 
-    <para os="a0a">We need a working Perl to build glibc and test coreutils, it
+    <para os="m1">We need a working Perl to build glibc and test coreutils, it
     doesn't matter whether this is a 32-bit or a 64-bit program. But, the perl
     configure process knows nothing about multilib and assumes it will be installed
@@ -29 +29 @@
     easily install into <filename class="directory">/tools/lib</filename>.</para>
 
-    <para os="a0b">Installing successfully into a different directory such as
+    <para os="m2">Installing successfully into a different directory such as
     <filename class="directory">/tools/lib64</filename> would require more effort
    (compare how we install Perl in the final system) for no real gain. On this
@@ -38 +38 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
+<screen os="d"><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
    -Dcc="gcc ${BUILD32}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
+    xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>

BOOK/temp-tools/multilib/tcl-64bit.xml

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
+    <para os="m1">We need to change the default lib path to lib64:</para>
+
+<screen os="m2"><userinput>cd unix
+sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
-<screen><userinput>cd unix
-sed -i 's@\$(prefix)/lib@\$(prefix)/lib64@g' Makefile.in
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -53 +52 @@
     href="../common/tcl.xml"
     xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/tcl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-tools/multilib/texinfo.xml

@@ -27 +27 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/texinfo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/texinfo.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"