summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff54
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff
new file mode 100644
index 0000000..9440348
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/enc2xs_inc.diff
@@ -0,0 +1,54 @@
1Upstream-Status:Inappropriate [debian patches]
2From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 Mon Sep 17 00:00:00 2001
3From: Brendan O'Dea <bod@debian.org>
4Date: Tue, 8 Mar 2005 19:30:38 +1100
5Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories.
6
7Bug-Debian: http://bugs.debian.org/290336
8
9- ignore missing directories,
10- follow symlinks (/usr/share/perl/5.8 -> 5.8.4).
11- filter "." out when running "enc2xs -C", it's unnecessary and causes
12 issues with follow => 1 (see #603686 and [rt.cpan.org #64585])
13
14Patch-Name: debian/enc2xs_inc.diff
15---
16 cpan/Encode/bin/enc2xs | 8 ++++----
17 1 files changed, 4 insertions(+), 4 deletions(-)
18
19diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
20index 773c0a0..bc1ae1b 100644
21--- a/cpan/Encode/bin/enc2xs
22+++ b/cpan/Encode/bin/enc2xs
23@@ -924,11 +924,11 @@ use vars qw(
24 sub find_e2x{
25 eval { require File::Find; };
26 my (@inc, %e2x_dir);
27- for my $inc (@INC){
28+ for my $inc (grep -d, @INC){
29 push @inc, $inc unless $inc eq '.'; #skip current dir
30 }
31 File::Find::find(
32- sub {
33+ { wanted => sub {
34 my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
35 $atime,$mtime,$ctime,$blksize,$blocks)
36 = lstat($_) or return;
37@@ -938,7 +938,7 @@ sub find_e2x{
38 $e2x_dir{$File::Find::dir} ||= $mtime;
39 }
40 return;
41- }, @inc);
42+ }, follow => 1}, @inc);
43 warn join("\n", keys %e2x_dir), "\n";
44 for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){
45 $_E2X = $d;
46@@ -1005,7 +1005,7 @@ sub make_configlocal_pm {
47 $LocalMod{$enc} ||= $mod;
48 }
49 };
50- File::Find::find({wanted => $wanted}, @INC);
51+ File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC);
52 $_ModLines = "";
53 for my $enc ( sort keys %LocalMod ) {
54 $_ModLines .=