Author: ken
Date: 2005-10-28 08:22:00 -0600 (Fri, 28 Oct 2005)
New Revision: 1217
Added:
trunk/perl/perl-5.8.7-Configure-multilib-1.patch
trunk/perl/perl-5.8.7-libc_lib64-1.patch
Log:
Perl patches for multilib
Added: trunk/perl/perl-5.8.7-Configure-multilib-1.patch
===================================================================
--- trunk/perl/perl-5.8.7-Configure-multilib-1.patch 2005-10-27 18:35:01 UTC
(rev 1216)
+++ trunk/perl/perl-5.8.7-Configure-multilib-1.patch 2005-10-28 14:22:00 UTC
(rev 1217)
@@ -0,0 +1,35 @@
+Submitted By: Ryan Oliver <ryan(dot)oliver(at)pha(dot)com(dot)au>
+Date: 2005-10-20
+Initial Package Version: 5.8.7
+Origin: Ryan Oliver
+Description: this patch allows perl to be installed in /usr/lib32 or
/usr/lib64 instead of /usr/lib.
+
+--- perl-5.8.7/Configure-ORIG 2005-10-20 11:49:47.571389008 +1000
++++ perl-5.8.7/Configure 2005-10-20 12:30:35.571236464 +1000
+@@ -5930,6 +5930,8 @@
+ : The default "style" setting is made in installstyle.U
+ case "$installstyle" in
+ *lib/perl5*) set dflt privlib lib/$package/$version ;;
++*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
++*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
+ *) set dflt privlib lib/$version ;;
+ esac
+ eval $prefixit
+@@ -6433,6 +6435,8 @@
+ case "$sitelib" in
+ '') case "$installstyle" in
+ *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
++ *lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
++ *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
+ *) dflt=$siteprefix/lib/site_$prog/$version ;;
+ esac
+ ;;
+@@ -6560,6 +6564,8 @@
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+ case "$installstyle" in
+ *lib/perl5*)
dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
++ *lib32/perl5*)
dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
++ *lib64/perl5*)
dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
+ *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
+ esac
+ ;;
Added: trunk/perl/perl-5.8.7-libc_lib64-1.patch
===================================================================
--- trunk/perl/perl-5.8.7-libc_lib64-1.patch 2005-10-27 18:35:01 UTC (rev
1216)
+++ trunk/perl/perl-5.8.7-libc_lib64-1.patch 2005-10-28 14:22:00 UTC (rev
1217)
@@ -0,0 +1,22 @@
+Submitted By: Thomas Pegg <thomasp at linuxfromscratch dot org>
+Date: 2005-10-27
+Initial Package Version: 5.8.7
+Origin: based on perl-5.8.7-libc-1.patch
+Description: this patch adapts some hard-wired paths to the C library and
points it to use lib64 instead of lib.
+
+diff -uNr perl-5.8.0.orig/hints/linux.sh perl-5.8.0/hints/linux.sh
+--- perl-5.8.0.orig/hints/linux.sh 2002-06-05 23:46:00.000000000 +1000
++++ perl-5.8.0/hints/linux.sh 2003-02-19 16:32:18.000000000 +1100
+@@ -51,9 +51,9 @@
+ # We don't use __GLIBC__ and __GLIBC_MINOR__ because they
+ # are insufficiently precise to distinguish things like
+ # libc-2.0.6 and libc-2.0.7.
+-if test -L /lib/libc.so.6; then
+- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
+- libc=/lib/$libc
++if test -L /lib64/libc.so.6; then
++ libc=`ls -l /lib64/libc.so.6 | awk '{print $NF}'`
++ libc=/lib64/$libc
+ fi
+
+ # Configure may fail to find lstat() since it's a static/inline
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
