Changeset 793258c for final-system

Timestamp:

Aug 21, 2006, 10:38:49 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

132e0fa

Parents:

d7bb8c7

Message:

Added a multilib wrapper to perl on multilib builds.

Location:

final-system

Files:

• mips64-chapter.xml (modified) (1 diff)
• multilib/perl-64bit.xml (modified) (4 diffs)
• multilib/perl-n32.xml (added)
• multilib/perl.xml (added)
• ppc64-chapter.xml (modified) (1 diff)
• sparc64-chapter.xml (modified) (1 diff)
• x86_64-chapter.xml (modified) (1 diff)

final-system/mips64-chapter.xml

@@ -38 +38 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.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/readline.xml"/>

final-system/multilib/perl-64bit.xml

@@ -9 +9 @@
   <?dbhtml filename="perl-64bit.html"?>
 
-  <title>Perl-&perl-version;</title>
+  <title>Perl-&perl-version; 64 Bit</title>
 
   <indexterm zone="ch-system-perl">
@@ -22 +22 @@
     <title>Installation of Perl</title>
 
-    <para os="m1">In multilib builds we install compilers and libraries for each available
-    architecture.  The description below says that perl installs several hundred
-    libraries, but they are used by invoking <command>perl</command>, not by linking
-    to them with <command>ld</command>.  Although it is possible to install perl for
-    32 bits, move it to a different name, and then install the 64-bit version, it is
-    almost always invoked as just <command>perl</command>. That means only the
-    libraries and modules for the last version installed will be accessible. We
-    therefore only install one version.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
@@ -40 +31 @@
 
     <para os="p3">Perl does not, by default, know about library directories with names other
-    than lib, such as lib64.  The following patch will allow it to install to lib64:</para>
+    than lib, The following patch will allow it to install to other directories:</para>
 
 <screen os="p4"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
 
-    <para os="p5">There is a further (possibly cosmetic) anomaly - if we install perl and
+    <para os="s1">There is a further (possibly cosmetic) anomaly - if we install perl and
     then run <command>perl -V</command> it will claim that libc is in /lib.  The
-    following patch fixes this, but only takes effect when <command>make install
+    following sed fixes this, but only takes effect when <command>make install
     </command> is run:</para>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&perl-lib64-patch;</userinput></screen>
+<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
 
     <para os="m2">We still need to tell perl to actually use lib64:</para>
@@ -119 +110 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="perl.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+<screen os="m"><userinput>mv /usr/bin/perl{,-64}</userinput></screen>
+
+    <para os="n">Now we need to create a multilib wrapper that lets us choose
+    which perl installation to use.</para>
+
+<screen os="o"><userinput>cat &gt; perl_wrapper.c &lt;&lt; "EOF"
+#include &lt;stdio.h&gt;
+#include &lt;stdlib.h&gt;
+#include &lt;string.h&gt;
+#include &lt;unistd.h&gt;
+#include &lt;errno.h&gt;
+
+int main (int argc, char *argv[])
+{
+  char *perl_arch;
+  if ((perl_arch = getenv("PERL_ARCH")) == NULL)
+    perl_arch = "64";
+
+  char *filename = malloc(strlen(argv[0]) + strlen(perl_arch) + 2);
+  strcpy(filename, argv[0]);
+  strcat(filename, "-");
+  strcat(filename, perl_arch);
+
+  int ret = 0;
+  ret = execvp(filename, argv);
+  if ((ret != 0)&amp;&amp;(errno != 0))
+  {
+    char *errmsg = malloc(strlen(filename) + 19);
+    strcpy(errmsg, "Unable to execute ");
+    strcat(errmsg, filename);
+    perror(errmsg);
+    free(errmsg);
+  }
+
+  free(filename);
+
+  return ret;
+}
+EOF
+gcc ${BUILD64} perl_wrapper.c -o /usr/bin/perl</userinput></screen>
+
   </sect2>
 

final-system/ppc64-chapter.xml

@@ -34 +34 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.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/readline.xml"/>

final-system/sparc64-chapter.xml

@@ -34 +34 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.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/readline.xml"/>

final-system/x86_64-chapter.xml

@@ -34 +34 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.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/readline.xml"/>