diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-04-23 19:43:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-28 10:44:22 +0100 |
commit | 829b985eb5c329772db49da9838530a639cb2638 (patch) | |
tree | 3c18883d115058c2c96c60919b5c052d21b109e6 /meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff | |
parent | 3669de7f96100a5d4fbfc9b4e2ebc16851ba98ea (diff) | |
download | poky-829b985eb5c329772db49da9838530a639cb2638.tar.gz |
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 <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff new file mode 100644 index 0000000000..eac0fc30c4 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/debian/squelch-locale-warnings.diff | |||
@@ -0,0 +1,55 @@ | |||
1 | Upstream-Status:Inappropriate [debian patch] | ||
2 | |||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Subject: Squelch locale warnings in Debian package maintainer scripts | ||
5 | Bug-Debian: http://bugs.debian.org/508764 | ||
6 | |||
7 | The system locales are rather frequently out of sync with the C library | ||
8 | during package upgrades, causing a huge amount of useless Perl locale | ||
9 | warnings. Squelch them when running package maintainer scripts, detected | ||
10 | by the DPKG_RUNNING_VERSION environment variable. | ||
11 | |||
12 | Any real locale problem will show up after the system upgrade too, and | ||
13 | the warning will be triggered normally again at that point. | ||
14 | |||
15 | --- | ||
16 | locale.c | 4 ++++ | ||
17 | pod/perllocale.pod | 8 ++++++++ | ||
18 | 2 files changed, 12 insertions(+), 0 deletions(-) | ||
19 | |||
20 | diff --git a/locale.c b/locale.c | ||
21 | index 16ccce8..2592b3c 100644 | ||
22 | --- a/locale.c | ||
23 | +++ b/locale.c | ||
24 | @@ -359,6 +359,10 @@ Perl_init_i18nl10n(pTHX_ int printwarn) | ||
25 | char *p; | ||
26 | const bool locwarn = (printwarn > 1 || | ||
27 | (printwarn && | ||
28 | + | ||
29 | + /* Debian specific change - see http://bugs.debian.org/508764 */ | ||
30 | + (!PerlEnv_getenv("DPKG_RUNNING_VERSION")) && | ||
31 | + | ||
32 | (!(p = PerlEnv_getenv("PERL_BADLANG")) || atoi(p)))); | ||
33 | |||
34 | if (locwarn) { | ||
35 | diff --git a/pod/perllocale.pod b/pod/perllocale.pod | ||
36 | index 0dbabe7..60b7bab 100644 | ||
37 | --- a/pod/perllocale.pod | ||
38 | +++ b/pod/perllocale.pod | ||
39 | @@ -844,6 +844,14 @@ B<NOTE>: PERL_BADLANG only gives you a way to hide the warning message. | ||
40 | The message tells about some problem in your system's locale support, | ||
41 | and you should investigate what the problem is. | ||
42 | |||
43 | +=item DPKG_RUNNING_VERSION | ||
44 | + | ||
45 | +On Debian systems, if the DPKG_RUNNING_VERSION environment variable is | ||
46 | +set (to any value), the locale failure warnings will be suppressed just | ||
47 | +like with a zero PERL_BADLANG setting. This is done to avoid floods | ||
48 | +of spurious warnings during system upgrades. | ||
49 | +See L<http://bugs.debian.org/508764>. | ||
50 | + | ||
51 | =back | ||
52 | |||
53 | The following environment variables are not specific to Perl: They are | ||
54 | -- | ||
55 | tg: (a508b62..) debian/squelch-locale-warnings (depends on: upstream) | ||