[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-598-gdbf61b7

[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  dbf61b7e7112f65de9feccbbb5645164fb26462f (commit)
       via  e48f31d9aba4e711ccca89ec211853714e399cce (commit)
      from  6cf9571fd5908aedeea8d11e9f80a1ec713419cf (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 dbf61b7e7112f65de9feccbbb5645164fb26462f
Merge: e48f31d 6cf9571
Author: Chris Staub <chris at beaker67.com>
Date:   Fri Jan 10 02:57:18 2014 -0500

    Merge branch 'master' of git.cross-lfs.org:cross-lfs


commit e48f31d9aba4e711ccca89ec211853714e399cce
Author: Chris Staub <chris at beaker67.com>
Date:   Fri Jan 10 02:56:51 2014 -0500

    Add perl patches

diff --git a/patches/perl-5.18.2-Configure_multilib-1.patch b/patches/perl-5.18.2-Configure_multilib-1.patch
new file mode 100644
index 0000000..1bcb00f
--- /dev/null
+++ b/patches/perl-5.18.2-Configure_multilib-1.patch
@@ -0,0 +1,48 @@
+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
+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
+
+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 @@
+ : 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
+@@ -6467,6 +6469,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
+ 	;;
+@@ -6986,6 +6990,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
+ 		;;
diff --git a/patches/perl-5.18.2-libc-1.patch b/patches/perl-5.18.2-libc-1.patch
new file mode 100644
index 0000000..23b6de1
--- /dev/null
+++ b/patches/perl-5.18.2-libc-1.patch
@@ -0,0 +1,45 @@
+Submitted By: Jonathan Norman <Jonathan at bluesquarelinux.co.uk>
+Date: 2013-08-13
+Initial Package Version: 5.8.8
+Origin: Ryan Oliver
+Upstream Status: Unknown
+Description: This patch adapts some hard-wired paths to the C library.
+             It uses the $prefix variable to locate the correct libc.
+
+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.14.0 By Jonathan Norman on 2011-05-17
+          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-27
+Rediffed: Against 5.18.1 by William Harrington on 2013-08-13
+Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10
+
+diff -Naur perl-5.18.2.orig/hints/linux.sh perl-5.18.2/hints/linux.sh
+--- perl-5.18.2.orig/hints/linux.sh	2014-01-06 17:46:45.000000000 -0500
++++ perl-5.18.2/hints/linux.sh	2014-01-10 02:34:36.000000000 -0500
+@@ -66,9 +66,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 ${prefix}/lib/libc.so.6; then
++    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
++    libc=${prefix}/lib/$libc
+ fi
+ 
+ # Configure may fail to find lstat() since it's a static/inline
+@@ -456,3 +456,9 @@
+     libswanted="$libswanted pthread"
+     ;;
+ esac
++
++locincpth=""
++loclibpth=""
++glibpth="${prefix}/lib"
++usrinc="${prefix}/include"
++

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

Summary of changes:
 ...atch => perl-5.18.2-Configure_multilib-1.patch} |    7 ++++---
 ....18.1-libc-1.patch => perl-5.18.2-libc-1.patch} |    7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
 copy patches/{perl-5.18.1-Configure_multilib-1.patch => perl-5.18.2-Configure_multilib-1.patch} (88%)
 copy patches/{perl-5.18.1-libc-1.patch => perl-5.18.2-libc-1.patch} (84%)


hooks/post-receive
-- 
Cross-LFS Book