diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-17 16:48:59 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-18 11:23:48 +0100 |
commit | 6896ca82f106c65e6c7d08986cfe86d2305c6afa (patch) | |
tree | a9af7a0bb0371d61c86376805798839e4ad6e052 /meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch | |
parent | 646b596c99119f40060d84a4bc6349f3a2a4e893 (diff) | |
download | poky-6896ca82f106c65e6c7d08986cfe86d2305c6afa.tar.gz |
perl: Move perl-sanity -> perl
This was moved during the perl cleanup, it can/should be moved back now as
its confusing too many people.
(From OE-Core rev: ce69c21707aa19ab8a3f6c07dc5a560671ab53a4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch')
-rw-r--r-- | meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch b/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch new file mode 100644 index 0000000000..ed8ec1d416 --- /dev/null +++ b/meta/recipes-devtools/perl/files/0001-Somehow-this-module-breaks-through-the-perl-wrapper-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From e8e095b9c71c58f8197d6315359446b6b084cb2b Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 5 Jun 2018 14:58:42 +0300 | ||
4 | Subject: [PATCH] Somehow this module breaks through the perl wrapper and | ||
5 | declares perl binary to be 'perl.real'. This patch forces it back to perl. | ||
6 | |||
7 | Upstream-Status: Inappropriate [oe-core specific] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
14 | index 948c476..f537526 100644 | ||
15 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
16 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
17 | @@ -1110,6 +1110,9 @@ WARNING | ||
18 | } | ||
19 | |||
20 | foreach my $name (@$names){ | ||
21 | + # Getting MakeMaker.pm use perl wrapper instead of 'perl.real' directly | ||
22 | + $name =~ s/perl\.real/perl/ if ($name =~ /perl\.real/); | ||
23 | + | ||
24 | my ($abs, $use_dir); | ||
25 | if ($self->file_name_is_absolute($name)) { # /foo/bar | ||
26 | $abs = $name; | ||
27 | @@ -2006,6 +2009,7 @@ sub init_PERL { | ||
28 | |||
29 | $self->{PERL} ||= | ||
30 | $self->find_perl(5.0, \@perls, \@defpath, $Verbose ); | ||
31 | + | ||
32 | |||
33 | my $perl = $self->{PERL}; | ||
34 | $perl =~ s/^"//; | ||