summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-12-22 09:26:07 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-12 00:55:48 -0800
commitf57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d (patch)
treef6b24ea8f39fd6c83a161f91117641a851c4a9c6 /meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
parentfde91acaf7849d80a2b9c908398bee2c3452004e (diff)
downloadpoky-f57e9daf74d5fbab6c9a3f5e60e1320a0bf0642d.tar.gz
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/cpanplus_config_path.diff')
-rw-r--r--meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff43
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
new file mode 100644
index 0000000000..6956218f8a
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl-5.12.2/debian/cpanplus_config_path.diff
@@ -0,0 +1,43 @@
1From: Niko Tyni <ntyni@debian.org>
2Subject: Save local versions of CPANPLUS::Config::System into /etc/perl.
3
4This is a configuration file and needs to go in /etc by policy.
5Besides, /usr may not even be writable.
6
7This mirrors the Debian setup of CPAN.pm in debian/cpan_config_path.
8
9See #533707.
10
11---
12 cpan/CPANPLUS/lib/CPANPLUS/Configure.pm | 1 +
13 cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm | 3 +++
14 2 files changed, 4 insertions(+), 0 deletions(-)
15
16diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
17index baac91d..a3794de 100644
18--- a/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
19+++ b/cpan/CPANPLUS/lib/CPANPLUS/Configure.pm
20@@ -276,6 +276,7 @@ Saves the configuration to the package name you provided.
21 If this package is not C<CPANPLUS::Config::System>, it will
22 be saved in your C<.cpanplus> directory, otherwise it will
23 be attempted to be saved in the system wide directory.
24+(On Debian systems, this system wide directory is /etc/perl.)
25
26 If no argument is provided, it will default to your personal
27 config.
28diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
29index 1a38200..6ee0d82 100644
30--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
31+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants.pm
32@@ -199,6 +199,9 @@ use constant CONFIG_USER_FILE => sub {
33 ) . '.pm';
34 };
35 use constant CONFIG_SYSTEM_FILE => sub {
36+ # Debian-specific shortcut
37+ return '/etc/perl/CPANPLUS/Config/System.pm';
38+
39 require CPANPLUS::Internals;
40 require File::Basename;
41 my $dir = File::Basename::dirname(
42--
43tg: (c823880..) debian/cpanplus_config_path (depends on: upstream)