diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-06-17 00:19:42 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-01 15:38:20 +0100 |
| commit | 06d43a90acbe63baea62d220659149a3ff2f9198 (patch) | |
| tree | 7bc9adc24b74694192fba12119e87b0d86521fb5 /meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff | |
| parent | eb54c29d0566e01c287bdccbdb26c188aac66033 (diff) | |
| download | openembedded-core-contrib-06d43a90acbe63baea62d220659149a3ff2f9198.tar.gz | |
perl: 5.20.0 -> 5.22.0
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff')
| -rw-r--r-- | meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff new file mode 100644 index 0000000000..adb4bd9910 --- /dev/null +++ b/meta/recipes-devtools/perl/perl/debian/extutils_set_libperl_path.diff @@ -0,0 +1,37 @@ +From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001 +From: Niko Tyni <ntyni@debian.org> +Date: Sat, 10 May 2014 23:34:14 +0300 +Subject: EU:MM: set location of libperl.a under /usr/lib + +The Debian packaging moves libperl.a a couple of levels up from the +CORE directory to match other static libraries. + +Patch-Name: debian/extutils_set_libperl_path.diff +--- + cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- + pp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +index 5f1b87f..570a631 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +@@ -2505,7 +2505,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib} + ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/; + } + unless ($libperl && -f $lperl) { # Ilya's code... +- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE"; ++ my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/../.."; + $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL}; + $libperl ||= "libperl$self->{LIB_EXT}"; + $libperl = "$dir/$libperl"; +diff --git a/pp.c b/pp.c +index 42f156a..77c1279 100644 +--- a/pp.c ++++ b/pp.c +@@ -1,4 +1,4 @@ +-/* pp.c ++ /* pp.c + * + * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others |