Changeset b3458f8 for patches/perl-5.20.0-Configure_multilib-1.patch
- Timestamp:
- May 29, 2014, 1:54:47 PM (10 years ago)
- Branches:
- clfs-3.0.0-systemd, master, systemd
- Children:
- 44a25cc
- Parents:
- f626fce
- git-author:
- William Harrington <kb0iic@…> (05/29/14 13:54:34)
- git-committer:
- William Harrington <kb0iic@…> (05/29/14 13:54:47)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
patches/perl-5.20.0-Configure_multilib-1.patch
rf626fce rb3458f8 1 Submitted By: Ryan Oliver <ryan dot oliver at pha dot com dot au>2 Date: 201 3-08-133 Initial Package Version: 5. 8.84 Origin: Ryan Oliver5 Upstream Status: Unknown1 Submitted By: William Harrington <kb0iic at cross-lfs dot org> 2 Date: 2014-29-14 3 Initial Package Version: 5.12.0 4 Origin: Cross-LFS 5 Upstream Status: Not Applied - Internal to CLFS 6 6 Description: This patch allows perl to be installed in /usr/lib32 7 7 or /usr/lib64 instead of /usr/lib. 8 8 9 Rediffed: Against 5.10.0 by Joe Ciccone on 2008-08-30 10 Against 5.10.1 By Jim Gifford on 2009-08-25 11 Against 5.12.1 By Joe Ciccone on 2010-08-01 12 Against 5.16.1 By William Harrington on 2012-08-26 13 Rename for 5.16.2 by William Harrington on 2012-11-01 14 15 Rediffed: Against 5.18.0 by William Harrington on 2013-05-28 16 Rediffed: Against 5.18.1 by William Harrington on 2013-08-13 17 Rediffed: Against 5.18.2 by Chris Staub on 2014-01-10 18 19 Rename for 5.20.0 by William Harrington on 2014-05-29 20 21 diff -Naur perl-5.18.2.orig/Configure perl-5.18.2/Configure 22 --- perl-5.18.2.orig/Configure 2014-01-06 17:46:42.000000000 -0500 23 +++ perl-5.18.2/Configure 2014-01-10 02:38:43.000000000 -0500 24 @@ -6219,6 +6219,8 @@ 9 diff -Naur perl-5.20.0.orig/Configure perl-5.20.0/Configure 10 --- perl-5.20.0.orig/Configure 2014-05-26 13:34:18.000000000 +0000 11 +++ perl-5.20.0/Configure 2014-05-29 13:23:29.534283207 +0000 12 @@ -1359,6 +1359,7 @@ 13 glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" 14 test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" 15 test -f /shlib/libc.so && glibpth="/shlib $glibpth" 16 +test -d /usr/lib32 && glibpth="$glibpth /lib32 /usr/lib32 /usr/local/lib32" 17 test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" 18 19 : Private path used by Configure to find libraries. Its value 20 @@ -6500,6 +6501,8 @@ 25 21 : The default "style" setting is made in installstyle.U 26 22 case "$installstyle" in … … 31 27 esac 32 28 eval $prefixit 33 @@ -6 467,6 +6469,8 @@29 @@ -6748,6 +6751,8 @@ 34 30 case "$sitelib" in 35 31 '') case "$installstyle" in 36 32 *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; 37 + *lib32/perl5*) dflt=$ siteprefix/lib32/$package/site_$prog/$version ;;33 + *lib32/perl5*) dflt=$witeprefix/lib32/$package/site_$prog/$version ;; 38 34 + *lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;; 39 35 *) dflt=$siteprefix/lib/site_$prog/$version ;; 40 36 esac 41 37 ;; 42 @@ - 6986,6 +6990,8@@38 @@ -7166,6 +7171,9 @@ 43 39 prog=`echo $package | $sed 's/-*[0-9.]*$//'` 44 40 case "$installstyle" in 45 41 *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;; 46 42 + *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;; 43 + 47 44 + *lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;; 48 45 *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
Note:
See TracChangeset
for help on using the changeset viewer.