mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 06:49:32 +02:00
e73deac6dc
Changed: - The Copying has no change, except the company address. - pick patches from debian http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz - Not used by oe: deprecate-with-apt.diff patchlevel.diff fakeroot.diff - Create/Update perl-rdepends_${PV}.inc by the hardcode script; - Update config.sh by: 1) Copy the Perl 5.20.0 source code onto your TARGET machine linux qemuarm 3.14.5-yocto-standard from OE-Core rev: f506d0660c9949485268a92724ac770b5457b0ca 2) Execute sh Configure as normal and configure as required, do not "make"; 3) Compare with the old config.sh files, and update; - perl-ptest.inc 1) Copy the souce code to ptest since almost 112 test cases failed with the reason that no souce code found; 2) Add two patches to fix test case issue; - perl-native Reference perl (5.20.0-1) in debian to update perl shared library headers https://packages.debian.org/experimental/i386/perl/filelist Obsolete: - 09_fix_installperl.patch The dead code was removed from installperl http://perl5.git.perl.org/perl.git/commit/236818e0b9d9fe874831086b4d0b94dc6f245dfd - perl-build-in-t-dir.patch The upstream has fix it. The issue description: Perl cannot cross build in a path containing a directory that has the name of "t". As an example, you can make the perl build fail with "mkdir -p /tmp/build/t", go to the directory, unpack the sources, configure and cross build. - 0001-Fix-misparsing-of-maketext-strings.patch as they are part of the upstream code now: http://perl5.git.perl.org/perl.git/commit/1735f6f53ca19f99c6e9e39496c486af323ba6a8 - 0001-Prevent-premature-hsplit-calls-and-only-trigger-REHA.patch the hash function changed: http://perl5.git.perl.org/perl.git/commit/7dc8663964c66a698d31bbdc8e8abed69bddeec3 (From OE-Core rev: c7ac82415efc42ff7a93c6df163f88f2dde00d26) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
From 98e7248580af353d781b24715b42af5b6a4caf35 Mon Sep 17 00:00:00 2001
|
|
From: Brendan O'Dea <bod@debian.org>
|
|
Date: Tue, 8 Mar 2005 19:30:38 +1100
|
|
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])
|
|
|
|
Patch-Name: debian/enc2xs_inc.diff
|
|
---
|
|
cpan/Encode/bin/enc2xs | 8 ++++----
|
|
t/porting/customized.t | 3 +++
|
|
2 files changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
|
|
index c44487d..a9af54f 100644
|
|
--- a/cpan/Encode/bin/enc2xs
|
|
+++ b/cpan/Encode/bin/enc2xs
|
|
@@ -929,11 +929,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;
|
|
@@ -943,7 +943,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;
|
|
@@ -1010,7 +1010,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 .=
|
|
diff --git a/t/porting/customized.t b/t/porting/customized.t
|
|
index a769c58..6b9977f 100644
|
|
--- a/t/porting/customized.t
|
|
+++ b/t/porting/customized.t
|
|
@@ -99,8 +99,11 @@ foreach my $module ( sort keys %Modules ) {
|
|
print $data_fh join(' ', $module, $file, $id), "\n";
|
|
next;
|
|
}
|
|
+SKIP: {
|
|
+ skip("$file modified for Debian", 1) if $file eq 'cpan/Encode/bin/enc2xs';
|
|
my $should_be = $customised{ $module }->{ $file };
|
|
is( $id, $should_be, "SHA for $file matches stashed SHA" );
|
|
+}
|
|
}
|
|
}
|
|
|