mirror of
https://git.yoctoproject.org/poky
synced 2026-07-26 19:17:07 +00:00
Hongxu Jia
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>
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From 25994ac1124566398adee13806ef9a73d2cae150 Mon Sep 17 00:00:00 2001
|
|
From: Niko Tyni <ntyni@debian.org>
|
|
Date: Tue, 16 Oct 2012 23:07:56 +0300
|
|
Subject: Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent
|
|
is writable
|
|
|
|
The site directories do not exist on a typical Debian system. The build
|
|
systems will create them when necessary, so there's no need for a prompt
|
|
suggesting local::lib if the first existing parent directory is writable.
|
|
|
|
Also, writability of the core directories is not interesting as we
|
|
explicitly tell CPAN not to touch those with INSTALLDIRS=site.
|
|
|
|
Bug-Debian: http://bugs.debian.org/688842
|
|
Patch-Name: debian/cpan-missing-site-dirs.diff
|
|
---
|
|
cpan/CPAN/lib/CPAN/FirstTime.pm | 31 +++++++++++++++++++++++++++----
|
|
1 file changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
index 4416072..187f5c4 100644
|
|
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
@@ -2045,11 +2045,34 @@ sub _print_urllist {
|
|
};
|
|
}
|
|
|
|
+# Debian modification: return true if this directory
|
|
+# or the first existing one upwards is writable
|
|
+sub _can_write_to_this_or_parent {
|
|
+ my ($dir) = @_;
|
|
+ my @parts = File::Spec->splitdir($dir);
|
|
+ while (@parts) {
|
|
+ my $cur = File::Spec->catdir(@parts);
|
|
+ return 1 if -w $cur;
|
|
+ return 0 if -e _;
|
|
+ pop @parts;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+# Debian specific modification: the site directories don't necessarily
|
|
+# exist on the system, but the build systems create them when necessary,
|
|
+# so return true if the first existing directory upwards is writable
|
|
+#
|
|
+# Furthermore, on Debian, only test the site directories
|
|
+# (installsite*, expanded to /usr/local/{share,lib}/perl),
|
|
+# not the core ones
|
|
+# (install*lib, expanded to /usr/{share,lib}/perl).
|
|
+# We pass INSTALLDIRS=site by default to keep CPAN from touching
|
|
+# the core directories.
|
|
+
|
|
sub _can_write_to_libdirs {
|
|
- return -w $Config{installprivlib}
|
|
- && -w $Config{installarchlib}
|
|
- && -w $Config{installsitelib}
|
|
- && -w $Config{installsitearch}
|
|
+ return _can_write_to_this_or_parent($Config{installsitelib})
|
|
+ && _can_write_to_this_or_parent($Config{installsitearch})
|
|
}
|
|
|
|
sub _using_installbase {
|