[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1164-gb3458f8

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  b3458f81893bfd55f8ea694ad72c009181ac3c8e (commit)
      from  f626fce9cf84de937662e3c947d7394708b8c20a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3458f81893bfd55f8ea694ad72c009181ac3c8e
Author: William Harrington <kb0iic at cross-lfs.org>
Date:   Thu May 29 08:54:34 2014 -0500

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

diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index ecf46af..655d43e 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -81,8 +81,8 @@
 <!ENTITY iproute2-libdir-patch-size "1.990 KB">
 
 <!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 -->
 
diff --git a/patches/perl-5.20.0-Configure_multilib-1.patch b/patches/perl-5.20.0-Configure_multilib-1.patch
index 9d9f384..9b08d46 100644
--- a/patches/perl-5.20.0-Configure_multilib-1.patch
+++ b/patches/perl-5.20.0-Configure_multilib-1.patch
@@ -1,27 +1,23 @@
-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
  *lib/perl5*) set dflt privlib lib/$package/$version ;;
@@ -30,20 +26,21 @@ diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure
  *)	 set dflt privlib lib/$version ;;
  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 ;;
  		esac

-----------------------------------------------------------------------

Summary of changes:
 BOOK/patches.ent                               |    4 +-
 patches/perl-5.20.0-Configure_multilib-1.patch |   45 +++++++++++-------------
 2 files changed, 23 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book