Index: general.ent
===================================================================
--- general.ent (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ general.ent (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -1,5 +1,5 @@
-
+
@@ -14,5 +14,5 @@
-
+
Index: introduction/mips64/changelog.xml
===================================================================
--- introduction/mips64/changelog.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ introduction/mips64/changelog.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -35,4 +35,13 @@
+ November 11, 2005
+
+
+ [ken] - Reduce temporary perl to a single 32-bit install.
+
+
+
+
+
October 31, 2005
Index: introduction/sparc64/changelog.xml
===================================================================
--- introduction/sparc64/changelog.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ introduction/sparc64/changelog.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -35,4 +35,13 @@
+ November 11, 2005
+
+
+ [ken] - Reduce temporary perl to a single 32-bit install.
+
+
+
+
+
November 10, 2005
Index: introduction/x86_64/changelog.xml
===================================================================
--- introduction/x86_64/changelog.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ introduction/x86_64/changelog.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -35,4 +35,13 @@
+ November 11, 2005
+
+
+ [ken] - Reduce temporary perl to a single 32-bit install.
+
+
+
+
+
November 10, 2005
Index: temp-tools/mips64-chapter.xml
===================================================================
--- temp-tools/mips64-chapter.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ temp-tools/mips64-chapter.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -18,6 +18,4 @@
-
-
Index: mp-tools/multilib/perl-64bit.xml
===================================================================
--- temp-tools/multilib/perl-64bit.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ (revision )
@@ -1,75 +1,0 @@
-
-
- %general-entities;
-]>
-
-
-
-
- Perl-&perl-version; 64 Bit
-
-
- Perl
- temporary tools, 64 Bit
-
-
-
-
-
- Installation of Perl
-
-
-
-
-
- Make sure Perl looks at /tools/lib64 for shared libraries:
-
-sed -i 's@\${prefix}/lib@\${prefix}/lib64@g' hints/linux.sh
-
-
-
-./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
- -Dcc="gcc ${BUILD64}"
-
-
-
-
-
-
-
-
-
-cp perl pod/pod2man /tools/bin
-install -d /tools/lib64/perl5/&perl-version;
-cp -R lib/* /tools/lib64/perl5/&perl-version;
-
-
-
-
-
-
- Details on this package are located in
-
-
-
-
Index: mp-tools/multilib/perl-n32.xml
===================================================================
--- temp-tools/multilib/perl-n32.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ (revision )
@@ -1,72 +1,0 @@
-
-
- %general-entities;
-]>
-
-
-
-
- Perl-&perl-version; N32
-
-
- Perl
- temporary tools, N32
-
-
-
-
-
- Installation of Perl
-
-
-
-
-
- Make sure Perl looks at /tools/lib32 for shared libraries:
-
-sed -i 's@\${prefix}/lib@\${prefix}/lib32@g' hints/linux.sh
-
-
-
-./configure.gnu --prefix=/tools -Dstatic_ext='Data/Dumper IO Fcntl POSIX' \
- -Dcc="gcc ${BUILDN32}"
-
-
-
-
-
-
-
- Install the libraries:
-
-install -d /tools/lib32/perl5/&perl-version;
-cp -R lib/* /tools/lib32/perl5/&perl-version;
-
-
-
-
-
-
- Details on this package are located in
-
-
-
-
Index: temp-tools/multilib/perl.xml
===================================================================
--- temp-tools/multilib/perl.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ temp-tools/multilib/perl.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -9,5 +9,5 @@
- Perl-&perl-version; 32 Bit
+ Perl-&perl-version;
@@ -22,4 +22,17 @@
Installation of Perl
+
+ 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 /tools/lib.
+
+ Installing successfully into a different directory such as
+ /tools/lib64 would require more effort
+ (compare how we install Perl in the final system) for no real gain. On this
+ multilib system, /tools/lib is where we
+ install 32-bit libraries, so for consistency we will build a 32-bit Perl here.
+
-
Index: temp-tools/x86_64-chapter.xml
===================================================================
--- temp-tools/x86_64-chapter.xml (revision 4766a6324e8f49e4428e58b9cdf0ea18c2ca51b8)
+++ temp-tools/x86_64-chapter.xml (revision a0bdcb7a9f3488fbd97a030799ae3bf4e251f4f2)
@@ -18,5 +18,4 @@
-