| 1 |
bluebird 09/04/26 11:19:57 |
| 2 |
|
| 3 |
Modified: perl-5.8.8-lib64.patch |
| 4 |
Added: perl-5.8.8-lib32.patch |
| 5 |
Log: |
| 6 |
Install libraries into the correct directory if libdir is lib32, simplify the patches, bug #266052 |
| 7 |
(Portage version: 2.2_rc31/cvs/Linux sparc64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-lang/perl/files/perl-5.8.8-lib64.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib64.patch?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib64.patch?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib64.patch?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: perl-5.8.8-lib64.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib64.patch,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- perl-5.8.8-lib64.patch 18 Nov 2007 17:46:36 -0000 1.3 |
| 23 |
+++ perl-5.8.8-lib64.patch 26 Apr 2009 11:19:57 -0000 1.4 |
| 24 |
@@ -1,35 +1,23 @@ |
| 25 |
---- Configure.orig 2006-02-03 16:15:00.000000000 -0500 |
| 26 |
-+++ Configure 2006-02-03 16:25:04.000000000 -0500 |
| 27 |
-@@ -1256,17 +1256,24 @@ locincpth="$locincpth /opt/gnu/include / |
| 28 |
- : no include file wanted by default |
| 29 |
- inclwanted='' |
| 30 |
- |
| 31 |
-+: determine libdir name |
| 32 |
-+: Should be */lib64 on x86-64, sparc64, ppc64 |
| 33 |
-+case `arch` in |
| 34 |
-+ x86_64) lib='lib64';; |
| 35 |
-+ *) lib='lib';; |
| 36 |
-+esac |
| 37 |
-+ |
| 38 |
- groupstype='' |
| 39 |
- libnames='' |
| 40 |
+--- a/Configure |
| 41 |
++++ b/Configure |
| 42 |
+@@ -1255,12 +1255,12 @@ libnames='' |
| 43 |
: change the next line if compiling for Xenix/286 on Xenix/386 |
| 44 |
xlibpth='/usr/lib/386 /lib/386' |
| 45 |
: Possible local library directories to search. |
| 46 |
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" |
| 47 |
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" |
| 48 |
-+loclibpth="/usr/local/$lib /opt/local/$lib /usr/gnu/$lib" |
| 49 |
-+loclibpth="$loclibpth /opt/gnu/$lib /usr/GNU/$lib /opt/GNU/$lib" |
| 50 |
++loclibpth="/usr/local/lib64 /opt/local/lib64 /usr/gnu/lib64" |
| 51 |
++loclibpth="$loclibpth /opt/gnu/lib64 /usr/GNU/lib64 /opt/GNU/lib64" |
| 52 |
|
| 53 |
: general looking path for locating libraries |
| 54 |
-glibpth="/lib /usr/lib $xlibpth" |
| 55 |
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" |
| 56 |
-+glibpth="/$lib /usr/$lib $xlibpth" |
| 57 |
-+glibpth="$glibpth /usr/ccs/$lib /usr/ucblib /usr/local/$lib" |
| 58 |
++glibpth="/lib64 /usr/lib64 $xlibpth" |
| 59 |
++glibpth="$glibpth /usr/ccs/lib64 /usr/ucblib /usr/local/lib64" |
| 60 |
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" |
| 61 |
test -f /shlib/libc.so && glibpth="/shlib $glibpth" |
| 62 |
|
| 63 |
-@@ -5951,8 +5958,8 @@ fi |
| 64 |
+@@ -5945,8 +5945,8 @@ fi |
| 65 |
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7. |
| 66 |
case "$installstyle" in |
| 67 |
'') case "$prefix" in |
| 68 |
@@ -40,7 +28,7 @@ |
| 69 |
esac |
| 70 |
;; |
| 71 |
*) dflt="$installstyle" ;; |
| 72 |
-@@ -5968,8 +5975,8 @@ installstyle=$dflt |
| 73 |
+@@ -5962,8 +5962,8 @@ installstyle=$dflt |
| 74 |
: /opt/perl/lib/perl5... would be redundant. |
| 75 |
: The default "style" setting is made in installstyle.U |
| 76 |
case "$installstyle" in |
| 77 |
@@ -51,7 +39,7 @@ |
| 78 |
esac |
| 79 |
eval $prefixit |
| 80 |
$cat <<EOM |
| 81 |
-@@ -6471,8 +6478,8 @@ siteprefixexp="$ansexp" |
| 82 |
+@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp" |
| 83 |
prog=`echo $package | $sed 's/-*[0-9.]*$//'` |
| 84 |
case "$sitelib" in |
| 85 |
'') case "$installstyle" in |
| 86 |
@@ -62,7 +50,7 @@ |
| 87 |
esac |
| 88 |
;; |
| 89 |
*) dflt="$sitelib" |
| 90 |
-@@ -6598,8 +6605,8 @@ case "$vendorprefix" in |
| 91 |
+@@ -6592,8 +6592,8 @@ case "$vendorprefix" in |
| 92 |
'') |
| 93 |
prog=`echo $package | $sed 's/-*[0-9.]*$//'` |
| 94 |
case "$installstyle" in |
| 95 |
@@ -73,24 +61,16 @@ |
| 96 |
esac |
| 97 |
;; |
| 98 |
*) dflt="$vendorlib" |
| 99 |
-@@ -10556,9 +10563,9 @@ else |
| 100 |
+@@ -10550,9 +10550,9 @@ else |
| 101 |
else |
| 102 |
for net in net socket |
| 103 |
do |
| 104 |
- if test -f /usr/lib/lib$net$_a; then |
| 105 |
- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \ |
| 106 |
- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list |
| 107 |
-+ if test -f /usr/$lib/lib$net$_a; then |
| 108 |
-+ ( ($nm $nm_opt /usr/$lib/lib$net$_a | eval $nm_extract) || \ |
| 109 |
-+ $ar t /usr/$lib/lib$net$_a) 2>/dev/null >> libc.list |
| 110 |
++ if test -f /usr/lib64/lib$net$_a; then |
| 111 |
++ ( ($nm $nm_opt /usr/lib64/lib$net$_a | eval $nm_extract) || \ |
| 112 |
++ $ar t /usr/lib64/lib$net$_a) 2>/dev/null >> libc.list |
| 113 |
if $contains socket libc.list >/dev/null 2>&1; then |
| 114 |
d_socket="$define" |
| 115 |
socketlib="-l$net" |
| 116 |
-@@ -21677,6 +21684,7 @@ ldflags='$ldflags' |
| 117 |
- ldflags_uselargefiles='$ldflags_uselargefiles' |
| 118 |
- ldlibpthname='$ldlibpthname' |
| 119 |
- less='$less' |
| 120 |
-+lib='$lib' |
| 121 |
- lib_ext='$lib_ext' |
| 122 |
- libc='$libc' |
| 123 |
- libperl='$libperl' |
| 124 |
|
| 125 |
|
| 126 |
|
| 127 |
1.1 dev-lang/perl/files/perl-5.8.8-lib32.patch |
| 128 |
|
| 129 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib32.patch?rev=1.1&view=markup |
| 130 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib32.patch?rev=1.1&content-type=text/plain |
| 131 |
|
| 132 |
Index: perl-5.8.8-lib32.patch |
| 133 |
=================================================================== |
| 134 |
--- a/Configure |
| 135 |
+++ b/Configure |
| 136 |
@@ -1255,12 +1255,12 @@ libnames='' |
| 137 |
: change the next line if compiling for Xenix/286 on Xenix/386 |
| 138 |
xlibpth='/usr/lib/386 /lib/386' |
| 139 |
: Possible local library directories to search. |
| 140 |
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" |
| 141 |
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" |
| 142 |
+loclibpth="/usr/local/lib32 /opt/local/lib32 /usr/gnu/lib32" |
| 143 |
+loclibpth="$loclibpth /opt/gnu/lib32 /usr/GNU/lib32 /opt/GNU/lib32" |
| 144 |
|
| 145 |
: general looking path for locating libraries |
| 146 |
-glibpth="/lib /usr/lib $xlibpth" |
| 147 |
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" |
| 148 |
+glibpth="/lib32 /usr/lib32 $xlibpth" |
| 149 |
+glibpth="$glibpth /usr/ccs/lib32 /usr/ucblib /usr/local/lib32" |
| 150 |
test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" |
| 151 |
test -f /shlib/libc.so && glibpth="/shlib $glibpth" |
| 152 |
|
| 153 |
@@ -5945,8 +5945,8 @@ fi |
| 154 |
: Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7. |
| 155 |
case "$installstyle" in |
| 156 |
'') case "$prefix" in |
| 157 |
- *perl*) dflt='lib';; |
| 158 |
- *) dflt='lib/perl5' ;; |
| 159 |
+ *perl*) dflt='lib32';; |
| 160 |
+ *) dflt='lib32/perl5' ;; |
| 161 |
esac |
| 162 |
;; |
| 163 |
*) dflt="$installstyle" ;; |
| 164 |
@@ -5962,8 +5962,8 @@ installstyle=$dflt |
| 165 |
: /opt/perl/lib/perl5... would be redundant. |
| 166 |
: The default "style" setting is made in installstyle.U |
| 167 |
case "$installstyle" in |
| 168 |
-*lib/perl5*) set dflt privlib lib/$package/$version ;; |
| 169 |
-*) set dflt privlib lib/$version ;; |
| 170 |
+*lib32/perl5*) set dflt privlib lib32/$package/$version ;; |
| 171 |
+*) set dflt privlib lib32/$version ;; |
| 172 |
esac |
| 173 |
eval $prefixit |
| 174 |
$cat <<EOM |
| 175 |
@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp" |
| 176 |
prog=`echo $package | $sed 's/-*[0-9.]*$//'` |
| 177 |
case "$sitelib" in |
| 178 |
'') case "$installstyle" in |
| 179 |
- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; |
| 180 |
- *) dflt=$siteprefix/lib/site_$prog/$version ;; |
| 181 |
+ *lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;; |
| 182 |
+ *) dflt=$siteprefix/lib32/site_$prog/$version ;; |
| 183 |
esac |
| 184 |
;; |
| 185 |
*) dflt="$sitelib" |
| 186 |
@@ -6592,8 +6592,8 @@ case "$vendorprefix" in |
| 187 |
'') |
| 188 |
prog=`echo $package | $sed 's/-*[0-9.]*$//'` |
| 189 |
case "$installstyle" in |
| 190 |
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;; |
| 191 |
- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;; |
| 192 |
+ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;; |
| 193 |
+ *) dflt=$vendorprefix/lib32/vendor_$prog/$version ;; |
| 194 |
esac |
| 195 |
;; |
| 196 |
*) dflt="$vendorlib" |
| 197 |
@@ -10550,9 +10550,9 @@ else |
| 198 |
else |
| 199 |
for net in net socket |
| 200 |
do |
| 201 |
- if test -f /usr/lib/lib$net$_a; then |
| 202 |
- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \ |
| 203 |
- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list |
| 204 |
+ if test -f /usr/lib32/lib$net$_a; then |
| 205 |
+ ( ($nm $nm_opt /usr/lib32/lib$net$_a | eval $nm_extract) || \ |
| 206 |
+ $ar t /usr/lib32/lib$net$_a) 2>/dev/null >> libc.list |
| 207 |
if $contains socket libc.list >/dev/null 2>&1; then |
| 208 |
d_socket="$define" |
| 209 |
socketlib="-l$net" |
Archives