From 829b985eb5c329772db49da9838530a639cb2638 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Sat, 23 Apr 2011 19:43:17 -0700 Subject: perl: upgrade from 5.12.2 to 5.12.3 And changed the perl tarball URL to more stable cpan location. (From OE-Core rev: 3a08c401f298095840a2aee9079845f5ff434410) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- .../perl/perl-5.12.3/debian/enc2xs_inc.diff | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff') diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff new file mode 100644 index 0000000000..4cac4b75f4 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/debian/enc2xs_inc.diff @@ -0,0 +1,52 @@ +Upstream-Status:Inappropriate [debian patch] + +Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories. +Bug-Debian: http://bugs.debian.org/290336 + +- ignore missing directories, +- follow symlinks (/usr/share/perl/5.8 -> 5.8.4). +- filter "." out when running "enc2xs -C", it's unnecessary and causes + issues with follow => 1 (see #603686 and [rt.cpan.org #64585]) + +--- + cpan/Encode/bin/enc2xs | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs +index 773c0a0..bc1ae1b 100644 +--- a/cpan/Encode/bin/enc2xs ++++ b/cpan/Encode/bin/enc2xs +@@ -924,11 +924,11 @@ use vars qw( + sub find_e2x{ + eval { require File::Find; }; + my (@inc, %e2x_dir); +- for my $inc (@INC){ ++ for my $inc (grep -d, @INC){ + push @inc, $inc unless $inc eq '.'; #skip current dir + } + File::Find::find( +- sub { ++ { wanted => sub { + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, + $atime,$mtime,$ctime,$blksize,$blocks) + = lstat($_) or return; +@@ -938,7 +938,7 @@ sub find_e2x{ + $e2x_dir{$File::Find::dir} ||= $mtime; + } + return; +- }, @inc); ++ }, follow => 1}, @inc); + warn join("\n", keys %e2x_dir), "\n"; + for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){ + $_E2X = $d; +@@ -1005,7 +1005,7 @@ sub make_configlocal_pm { + $LocalMod{$enc} ||= $mod; + } + }; +- File::Find::find({wanted => $wanted}, @INC); ++ File::Find::find({wanted => $wanted, follow => 1}, grep -d && !/^\./, @INC); + $_ModLines = ""; + for my $enc ( sort keys %LocalMod ) { + $_ModLines .= +-- +tg: (a508b62..) debian/enc2xs_inc (depends on: upstream) -- cgit v1.2.3-54-g00ecf