r687 - in trunk/BOOK: . introduction/mips64 introduction/sparc64 introduction/x86_64 temp-tools temp-tools/multilib

ken at linuxfromscratch.org ken at linuxfromscratch.org
Fri Nov 11 09:57:22 PST 2005


Author: ken
Date: 2005-11-11 10:57:19 -0700 (Fri, 11 Nov 2005)
New Revision: 687

Removed:
   trunk/BOOK/temp-tools/multilib/perl-64bit.xml
   trunk/BOOK/temp-tools/multilib/perl-n32.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/mips64/changelog.xml
   trunk/BOOK/introduction/sparc64/changelog.xml
   trunk/BOOK/introduction/x86_64/changelog.xml
   trunk/BOOK/temp-tools/mips64-chapter.xml
   trunk/BOOK/temp-tools/multilib/perl.xml
   trunk/BOOK/temp-tools/sparc64-chapter.xml
   trunk/BOOK/temp-tools/x86_64-chapter.xml
Log:
Reduce multilib temporary perl to a single build.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/general.ent	2005-11-11 17:57:19 UTC (rev 687)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20051110">
+<!ENTITY version "CLFS-SVN-20051111">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
 <!ENTITY version-x86_64-64 "&version;-x86_64">
@@ -13,7 +13,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "November 10, 2005">
+<!ENTITY releasedate "November 11, 2005">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: trunk/BOOK/introduction/mips64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/mips64/changelog.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/introduction/mips64/changelog.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 11, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Reduce temporary perl to a single 32-bit install.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 31, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/sparc64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/sparc64/changelog.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/introduction/sparc64/changelog.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 11, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Reduce temporary perl to a single 32-bit install.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 10, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/introduction/x86_64/changelog.xml
===================================================================
--- trunk/BOOK/introduction/x86_64/changelog.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/introduction/x86_64/changelog.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -34,6 +34,15 @@
 -->
 
     <listitem>
+      <para>November 11, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Reduce temporary perl to a single 32-bit install.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 10, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/temp-tools/mips64-chapter.xml
===================================================================
--- trunk/BOOK/temp-tools/mips64-chapter.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/mips64-chapter.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -17,8 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
 
 </chapter>

Deleted: trunk/BOOK/temp-tools/multilib/perl-64bit.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/perl-64bit.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/multilib/perl-64bit.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-perl-64bit" role="wrap">
-  <?dbhtml filename="perl-64bit.html"?>
-
-  <title>Perl-&perl-version; 64 Bit</title>
-
-  <indexterm zone="ch-temp-tools-perl-64bit">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para>Make sure Perl looks at <filename
-    class="directory">/tools/lib64</filename> for shared libraries:</para>
-
-<screen><userinput>sed -i 's@\${prefix}/lib@\${prefix}/lib64 at g' hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
-   -Dcc="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-<screen><userinput>cp perl pod/pod2man /tools/bin
-install -d /tools/lib64/perl5/&perl-version;
-cp -R lib/* /tools/lib64/perl5/&perl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>

Deleted: trunk/BOOK/temp-tools/multilib/perl-n32.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/perl-n32.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/multilib/perl-n32.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-tools-perl-n32" role="wrap">
-  <?dbhtml filename="perl-n32.html"?>
-
-  <title>Perl-&perl-version; N32</title>
-
-  <indexterm zone="ch-temp-tools-perl-n32">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools, N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para>Make sure Perl looks at <filename
-    class="directory">/tools/lib32</filename> for shared libraries:</para>
-
-<screen><userinput>sed -i 's@\${prefix}/lib@\${prefix}/lib32 at g' hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-<screen><userinput>./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
-   -Dcc="gcc ${BUILDN32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <para>Install the libraries:</para>
-
-<screen><userinput>install -d /tools/lib32/perl5/&perl-version;
-cp -R lib/* /tools/lib32/perl5/&perl-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>

Modified: trunk/BOOK/temp-tools/multilib/perl.xml
===================================================================
--- trunk/BOOK/temp-tools/multilib/perl.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/multilib/perl.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -8,7 +8,7 @@
 <sect1 id="ch-temp-tools-perl" role="wrap">
   <?dbhtml filename="perl.html"?>
 
-  <title>Perl-&perl-version; 32 Bit</title>
+  <title>Perl-&perl-version;</title>
 
   <indexterm zone="ch-temp-tools-perl">
     <primary sortas="a-Perl">Perl</primary>
@@ -22,6 +22,19 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
+    <para os="a0a">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
+    in a 'lib' directory.  Using the same patch as for non-multilib systems we can
+    easily install into <filename class="directory">/tools/lib</filename>.</para>
+
+    <para os="a0b">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
+   multilib system, <filename class="directory">/tools/lib</filename> is where we
+   install 32-bit libraries, so for consistency we will build a 32-bit Perl here.
+   </para> 
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='aa'])"/>

Modified: trunk/BOOK/temp-tools/sparc64-chapter.xml
===================================================================
--- trunk/BOOK/temp-tools/sparc64-chapter.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/sparc64-chapter.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -17,7 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
 
 </chapter>

Modified: trunk/BOOK/temp-tools/x86_64-chapter.xml
===================================================================
--- trunk/BOOK/temp-tools/x86_64-chapter.xml	2005-11-10 21:39:45 UTC (rev 686)
+++ trunk/BOOK/temp-tools/x86_64-chapter.xml	2005-11-11 17:57:19 UTC (rev 687)
@@ -17,7 +17,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
 
 </chapter>




More information about the cross-lfs mailing list