diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff deleted file mode 100644 index 21711e88ed..0000000000 --- a/meta/recipes-devtools/perl/perl-5.14.3/debian/perlivp.diff +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Fri, 9 Jan 2009 18:54:47 +0200 | ||
5 | Subject: Make perlivp skip include directories in /usr/local | ||
6 | |||
7 | Bug-Debian: http://bugs.debian.org/510895 | ||
8 | |||
9 | On Sat, Jan 10, 2009 at 12:37:18AM +1100, Brendan O'Dea wrote: | ||
10 | > On Wed, Jan 7, 2009 at 12:21 AM, Niko Tyni <ntyni@debian.org> wrote: | ||
11 | |||
12 | > > We could create the directories in a postinst script, but I'm not sure | ||
13 | > > I see the point. They will be created automatically when installing | ||
14 | > > CPAN modules. | ||
15 | > | ||
16 | > The directories are intentionally not created, as this way they are | ||
17 | > excluded from the search path at start-up, saving a bunch of wasted | ||
18 | > stats at use/require time in the common case that the user has not | ||
19 | > installed any local packages. As Niko points out, they will be | ||
20 | > created as required. | ||
21 | |||
22 | Signed-off-by: Niko Tyni <ntyni@debian.org> | ||
23 | |||
24 | Patch-Name: debian/perlivp.diff | ||
25 | --- | ||
26 | utils/perlivp.PL | 1 + | ||
27 | 1 files changed, 1 insertions(+), 0 deletions(-) | ||
28 | |||
29 | diff --git a/utils/perlivp.PL b/utils/perlivp.PL | ||
30 | index 6fcb670..1401cac 100644 | ||
31 | --- a/utils/perlivp.PL | ||
32 | +++ b/utils/perlivp.PL | ||
33 | @@ -142,6 +142,7 @@ my $INC_total = 0; | ||
34 | my $INC_there = 0; | ||
35 | foreach (@INC) { | ||
36 | next if $_ eq '.'; # skip -d test here | ||
37 | + next if m|/usr/local|; # not shipped on Debian | ||
38 | if (-d $_) { | ||
39 | print "## Perl \@INC directory `$_' exists.\n" if $opt{'v'}; | ||
40 | $INC_there++; | ||