diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-12-22 09:26:07 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-12 00:55:48 -0800 |
commit | f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d (patch) | |
tree | f6b24ea8f39fd6c83a161f91117641a851c4a9c6 /meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff | |
parent | fde91acaf7849d80a2b9c908398bee2c3452004e (diff) | |
download | openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.gz openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.bz2 openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.xz openembedded-core-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.zip |
perl, perl-native: upgrade from 5.8.8 to 5.12.2
Deleted these patches as they are part of the upstream code now.
deleted: files/perl-5.8.8-gcc-4.2.patch
deleted: perl-5.12.2/makedepend-dash.patch
deleted: perl-5.12.2/native-no-gdbminc.patch
deleted: perl-5.12.2/54_debian_perldoc-r.patch
And rebased these patches to the newer source code
modified: files/letgcc-find-errno.patch
modified: perl-5.12.2/Makefile.patch
modified: perl-5.12.2/asm-pageh-fix.patch
modified: perl-5.12.2/native-nopacklist.patch
modified: perl-5.12.2/native-perlinc.patch
modified: perl-5.12.2/Makefile.SH.patch
modified: perl-5.12.2/installperl.patch
modified: perl-5.12.2/perl-dynloader.patch
modified: perl-5.12.2/09_fix_installperl.patch
get patches from debian perl ver 5.12.2-2
the fakeroot.diff patch from debian is conflicting with our
Makefile.SH.patch, hence disabling the fakeroot patch
use newly created config files
Created with current milestone branch on qemu machines
modified: config.sh
modified: config.sh-32
modified: config.sh-64
get some changes from oe's perl 5.10.1 recipe
fix the Makefile.SH.patch use miniperl instead of perl
import a OE 5.10.1 patch: uudmap_cross
fix install issues
add /usr in the destdir, so that perl gets installed in
/usr/bin/perl and not in /bin/perl
link /usr/lib/perl to /usr/lib/perl5 so that operations with
/usr/lib/perl path in them keep on working.
Fix/Improve perl packaging
avoid perl-module-module-* kind of packages
recreate perl-rdepends_5.12.2.inc file with new set of packages
import from oe perl-rprovide_5.12.2.inc
combine all unicore perl scripts in one package
simplify perl-lib
reduce no of perl recipe packages greatly.
Add zlib to depedancy
fix buildtime host contamination
This also fixes [BUGID #384]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff new file mode 100644 index 000000000..227dc1058 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/enc2xs_inc.diff @@ -0,0 +1,49 @@ +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). + + +--- + 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..049ecf9 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: (c823880..) debian/enc2xs_inc (depends on: upstream) |