Change 30324 by [EMAIL PROTECTED] on 2007/02/15 18:33:37
Integrate:
[ 25314]
Don't install ptar in module tree
[ 26964]
Don't install ptardiff in the module tree
[ 28344]
Subject: [PATCH: installperl] Was: Bug#369481: perl-base: 5.8.4-8sarge4
seemed to trigger "weak references not implemented"
From: Brendan O'Dea <[EMAIL PROTECTED]>
Date: Wed, 31 May 2006 22:51:48 +1000
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/installperl#34 integrate
Differences ...
==== //depot/maint-5.8/perl/installperl#34 (xtext) ====
Index: perl/installperl
--- perl/installperl#33~30140~ 2007-02-05 14:01:07.000000000 -0800
+++ perl/installperl 2007-02-15 10:33:37.000000000 -0800
@@ -181,11 +181,8 @@
if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
my($path, $modname) = ($1,$2);
- # strip trailing component first
- $path =~ s{/[^/]*$}{};
-
- # strip optional "/lib";
- $path =~ s{/lib\b}{};
+ # strip to optional "/lib", or remove trailing component
+ $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
# strip any leading /
$path =~ s{^/}{};
@@ -844,9 +841,11 @@
# p4 will conflict on the next update to the following lines:
# ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
- # scripts in lib/ExtUtils, and the prove script in lib/Test/Harness
+ # scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
+ # the corelist script from lib/Module/CoreList/bin and ptar* in
+ # lib/Archive/Tar/bin
# (they're installed later with other utils)
- return if $name =~ /^(?:cpan|instmodsh|prove)\z/;
+ return if $name =~ /^(?:cpan|instmodsh|prove|corelist|ptar|ptardiff)\z/;
# ignore the Makefiles
return if $name =~ /^makefile$/i;
@@ -876,7 +875,7 @@
}
if (-f $_) {
- if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) {
+ if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
$installlib = $installprivlib;
#We're installing *.al and *.ix files into $installprivlib,
#but we have to delete old *.al and *.ix files from the 5.000
End of Patch.
