Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 188268 Details for
Bug 266052
dev-lang/perl does not respect default libdir
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
perl-lib32.patch
perl-lib32.patch (text/plain), 8.84 KB, created by
Friedrich Oslage (RETIRED)
on 2009-04-13 21:36:51 UTC
(
hide
)
Description:
perl-lib32.patch
Filename:
MIME Type:
Creator:
Friedrich Oslage (RETIRED)
Created:
2009-04-13 21:36:51 UTC
Size:
8.84 KB
patch
obsolete
>Index: perl-5.8.8-r5.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r5.ebuild,v >retrieving revision 1.11 >diff -u -b -B -r1.11 perl-5.8.8-r5.ebuild >--- perl-5.8.8-r5.ebuild 11 Mar 2009 21:55:45 -0000 1.11 >+++ perl-5.8.8-r5.ebuild 13 Apr 2009 21:33:37 -0000 >@@ -123,7 +123,12 @@ > # filter it otherwise configure fails. See #125535. > epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch > >- [[ $(get_libdir) == lib64 ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch >+ case "$(get_libdir)" in >+ lib64) cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch;; >+ lib32) cd "${S}" && epatch "${FILESDIR}"/${P}-lib32.patch;; >+ lib) true;; >+ *) die "Something's wrong with your libdir, don't know how to treat it.";; >+ esac > > [[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch > [[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch >Index: perl-5.8.8-r6.ebuild >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v >retrieving revision 1.2 >diff -u -b -B -r1.2 perl-5.8.8-r6.ebuild >--- perl-5.8.8-r6.ebuild 11 Mar 2009 21:47:17 -0000 1.2 >+++ perl-5.8.8-r6.ebuild 13 Apr 2009 21:33:37 -0000 >@@ -123,7 +123,12 @@ > # filter it otherwise configure fails. See #125535. > epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch > >- [[ $(get_libdir) == lib64 ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch >+ case "$(get_libdir)" in >+ lib64) cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch;; >+ lib32) cd "${S}" && epatch "${FILESDIR}"/${P}-lib32.patch;; >+ lib) true;; >+ *) die "Something's wrong with your libdir, don't know how to treat it.";; >+ esac > > [[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch > [[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch >Index: files/perl-5.8.8-lib32.patch >=================================================================== >RCS file: files/perl-5.8.8-lib32.patch >diff -N files/perl-5.8.8-lib32.patch >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ files/perl-5.8.8-lib32.patch 13 Apr 2009 21:33:37 -0000 >@@ -0,0 +1,76 @@ >+--- a/Configure >++++ b/Configure >+@@ -1255,12 +1255,12 @@ libnames='' >+ : change the next line if compiling for Xenix/286 on Xenix/386 >+ xlibpth='/usr/lib/386 /lib/386' >+ : Possible local library directories to search. >+-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" >+-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" >++loclibpth="/usr/local/lib32 /opt/local/lib32 /usr/gnu/lib32" >++loclibpth="$loclibpth /opt/gnu/lib32 /usr/GNU/lib32 /opt/GNU/lib32" >+ >+ : general looking path for locating libraries >+-glibpth="/lib /usr/lib $xlibpth" >+-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" >++glibpth="/lib32 /usr/lib32 $xlibpth" >++glibpth="$glibpth /usr/ccs/lib32 /usr/ucblib /usr/local/lib32" >+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" >+ test -f /shlib/libc.so && glibpth="/shlib $glibpth" >+ >+@@ -5945,8 +5945,8 @@ fi >+ : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7. >+ case "$installstyle" in >+ '') case "$prefix" in >+- *perl*) dflt='lib';; >+- *) dflt='lib/perl5' ;; >++ *perl*) dflt='lib32';; >++ *) dflt='lib32/perl5' ;; >+ esac >+ ;; >+ *) dflt="$installstyle" ;; >+@@ -5962,8 +5962,8 @@ installstyle=$dflt >+ : /opt/perl/lib/perl5... would be redundant. >+ : The default "style" setting is made in installstyle.U >+ case "$installstyle" in >+-*lib/perl5*) set dflt privlib lib/$package/$version ;; >+-*) set dflt privlib lib/$version ;; >++*lib32/perl5*) set dflt privlib lib32/$package/$version ;; >++*) set dflt privlib lib32/$version ;; >+ esac >+ eval $prefixit >+ $cat <<EOM >+@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp" >+ prog=`echo $package | $sed 's/-*[0-9.]*$//'` >+ case "$sitelib" in >+ '') case "$installstyle" in >+- *lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;; >+- *) dflt=$siteprefix/lib/site_$prog/$version ;; >++ *lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;; >++ *) dflt=$siteprefix/lib32/site_$prog/$version ;; >+ esac >+ ;; >+ *) dflt="$sitelib" >+@@ -6592,8 +6592,8 @@ case "$vendorprefix" in >+ '') >+ prog=`echo $package | $sed 's/-*[0-9.]*$//'` >+ case "$installstyle" in >+- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;; >+- *) dflt=$vendorprefix/lib/vendor_$prog/$version ;; >++ *lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;; >++ *) dflt=$vendorprefix/lib32/vendor_$prog/$version ;; >+ esac >+ ;; >+ *) dflt="$vendorlib" >+@@ -10550,9 +10550,9 @@ else >+ else >+ for net in net socket >+ do >+- if test -f /usr/lib/lib$net$_a; then >+- ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \ >+- $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list >++ if test -f /usr/lib32/lib$net$_a; then >++ ( ($nm $nm_opt /usr/lib32/lib$net$_a | eval $nm_extract) || \ >++ $ar t /usr/lib32/lib$net$_a) 2>/dev/null >> libc.list >+ if $contains socket libc.list >/dev/null 2>&1; then >+ d_socket="$define" >+ socketlib="-l$net" >Index: files/perl-5.8.8-lib64.patch >=================================================================== >RCS file: /var/cvsroot/gentoo-x86/dev-lang/perl/files/perl-5.8.8-lib64.patch,v >retrieving revision 1.3 >diff -u -b -B -r1.3 perl-5.8.8-lib64.patch >--- files/perl-5.8.8-lib64.patch 18 Nov 2007 17:46:36 -0000 1.3 >+++ files/perl-5.8.8-lib64.patch 13 Apr 2009 21:33:37 -0000 >@@ -1,35 +1,23 @@ >---- Configure.orig 2006-02-03 16:15:00.000000000 -0500 >-+++ Configure 2006-02-03 16:25:04.000000000 -0500 >-@@ -1256,17 +1256,24 @@ locincpth="$locincpth /opt/gnu/include / >- : no include file wanted by default >- inclwanted='' >- >-+: determine libdir name >-+: Should be */lib64 on x86-64, sparc64, ppc64 >-+case `arch` in >-+ x86_64) lib='lib64';; >-+ *) lib='lib';; >-+esac >-+ >- groupstype='' >- libnames='' >+--- a/Configure >++++ b/Configure >+@@ -1255,12 +1255,12 @@ libnames='' > : change the next line if compiling for Xenix/286 on Xenix/386 > xlibpth='/usr/lib/386 /lib/386' > : Possible local library directories to search. > -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" > -loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" >-+loclibpth="/usr/local/$lib /opt/local/$lib /usr/gnu/$lib" >-+loclibpth="$loclibpth /opt/gnu/$lib /usr/GNU/$lib /opt/GNU/$lib" >++loclibpth="/usr/local/lib64 /opt/local/lib64 /usr/gnu/lib64" >++loclibpth="$loclibpth /opt/gnu/lib64 /usr/GNU/lib64 /opt/GNU/lib64" > > : general looking path for locating libraries > -glibpth="/lib /usr/lib $xlibpth" > -glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" >-+glibpth="/$lib /usr/$lib $xlibpth" >-+glibpth="$glibpth /usr/ccs/$lib /usr/ucblib /usr/local/$lib" >++glibpth="/lib64 /usr/lib64 $xlibpth" >++glibpth="$glibpth /usr/ccs/lib64 /usr/ucblib /usr/local/lib64" > test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" > test -f /shlib/libc.so && glibpth="/shlib $glibpth" > >-@@ -5951,8 +5958,8 @@ fi >+@@ -5945,8 +5945,8 @@ fi > : Reproduce behavior of 5.005 and earlier, maybe drop that in 5.7. > case "$installstyle" in > '') case "$prefix" in >@@ -40,7 +28,7 @@ > esac > ;; > *) dflt="$installstyle" ;; >-@@ -5968,8 +5975,8 @@ installstyle=$dflt >+@@ -5962,8 +5962,8 @@ installstyle=$dflt > : /opt/perl/lib/perl5... would be redundant. > : The default "style" setting is made in installstyle.U > case "$installstyle" in >@@ -51,7 +39,7 @@ > esac > eval $prefixit > $cat <<EOM >-@@ -6471,8 +6478,8 @@ siteprefixexp="$ansexp" >+@@ -6465,8 +6465,8 @@ siteprefixexp="$ansexp" > prog=`echo $package | $sed 's/-*[0-9.]*$//'` > case "$sitelib" in > '') case "$installstyle" in >@@ -62,7 +50,7 @@ > esac > ;; > *) dflt="$sitelib" >-@@ -6598,8 +6605,8 @@ case "$vendorprefix" in >+@@ -6592,8 +6592,8 @@ case "$vendorprefix" in > '') > prog=`echo $package | $sed 's/-*[0-9.]*$//'` > case "$installstyle" in >@@ -73,24 +61,16 @@ > esac > ;; > *) dflt="$vendorlib" >-@@ -10556,9 +10563,9 @@ else >+@@ -10550,9 +10550,9 @@ else > else > for net in net socket > do > - if test -f /usr/lib/lib$net$_a; then > - ( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) || \ > - $ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list >-+ if test -f /usr/$lib/lib$net$_a; then >-+ ( ($nm $nm_opt /usr/$lib/lib$net$_a | eval $nm_extract) || \ >-+ $ar t /usr/$lib/lib$net$_a) 2>/dev/null >> libc.list >++ if test -f /usr/lib64/lib$net$_a; then >++ ( ($nm $nm_opt /usr/lib64/lib$net$_a | eval $nm_extract) || \ >++ $ar t /usr/lib64/lib$net$_a) 2>/dev/null >> libc.list > if $contains socket libc.list >/dev/null 2>&1; then > d_socket="$define" > socketlib="-l$net" >-@@ -21677,6 +21684,7 @@ ldflags='$ldflags' >- ldflags_uselargefiles='$ldflags_uselargefiles' >- ldlibpthname='$ldlibpthname' >- less='$less' >-+lib='$lib' >- lib_ext='$lib_ext' >- libc='$libc' >- libperl='$libperl'
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=188268">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 266052
: 188268
