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