Changeset 06f33c6

Timestamp:

May 30, 2014, 1:22:48 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-sysvinit, sysvinit

Children:

15bbf0e

Parents:

149f9af

git-author:

William Harrington <kb0iic@…> (05/29/14 06:54:34)

git-committer:

Chris Staub <chris@…> (05/30/14 01:22:48)

Message:

Update perl 5.20.0 configure multilib patch content and size and md5 hash.

Files:

• BOOK/patches.ent (modified) (1 diff)
• patches/perl-5.20.0-Configure_multilib-1.patch (modified) (2 diffs)

BOOK/patches.ent

@@ -82 +82 @@
 
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "x6c1df5fac5c88f9a79963a19e6f8bc02">
-<!ENTITY perl-multilib-patch-size "2.055 KB">
+<!ENTITY perl-multilib-patch-md5 "6e6d589a09c746a2318b6200bd1aa733">
+<!ENTITY perl-multilib-patch-size "2.002 KB">
 
 <!-- Start of Pure64 patches -->

patches/perl-5.20.0-Configure_multilib-1.patch

@@ -1 @@
-Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>
-Date: 2013-08-13
-Initial Package Version: 5.8.8
-Origin: Ryan Oliver
-Upstream Status: Unknown
+Submitted By: William Harrington <kb0iic at cross-lfs dot org>
+Date: 2014-29-14
+Initial Package Version: 5.12.0
+Origin: Cross-LFS
+Upstream Status: Not Applied - Internal to CLFS
 Description: This patch allows perl to be installed in /usr/lib32
              or /usr/lib64 instead of /usr/lib.
 
-Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30
-          Against 5.10.1 By Jim Gifford on 2009-08-25
-          Against 5.12.1 By Joe Ciccone on 2010-08-01
-          Against 5.16.1 By William Harrington on 2012-08-26
-Rename for 5.16.2 by William Harrington on 2012-11-01
-
-Rediffed: Against 5.18.0 by William Harrington on 2013-05-28
-Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
-Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
-
-Rename for 5.20.0 by William Harrington on 2014-05-29
-
-diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
---- perl-5.18.2.orig/Configure  2014-01-06 17:46:42.000000000 -0500
-+++ perl-5.18.2/Configure       2014-01-10 02:38:43.000000000 -0500
-@@ -6219,6 +6219,8 @@
+diff -Naur perl-5.20.0.orig/Configure perl-5.20.0/Configure
+--- perl-5.20.0.orig/Configure  2014-05-26 13:34:18.000000000 +0000
++++ perl-5.20.0/Configure       2014-05-29 13:23:29.534283207 +0000
+@@ -1359,6 +1359,7 @@
+ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
++test -d /usr/lib32         && glibpth="$glibpth /lib32 /usr/lib32 /usr/local/lib32"
+ test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
+ 
+ : Private path used by Configure to find libraries.  Its value
+@@ -6500,6 +6501,8 @@
  : The default "style" setting is made in installstyle.U
  case "$installstyle" in
@@ -31 +27 @@
  esac
  eval $prefixit
-@@ -6467,6 +6469,8 @@
+@@ -6748,6 +6751,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 ;;
++       *lib32/perl5*) dflt=$witeprefix/lib32/$package/site_$prog/$version ;;
 +       *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
         *)       dflt=$siteprefix/lib/site_$prog/$version ;;
         esac
         ;;
-@@ -6986,6 +6990,8 @@
+@@ -7166,6 +7171,9 @@
                 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 ;;