summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
diff options
context:
space:
mode:
authorTim Orling <timothy.t.orling@linux.intel.com>2018-09-06 22:00:25 -0700
committerTim Orling <timothy.t.orling@linux.intel.com>2018-09-06 22:07:29 -0700
commit610991e483d2cf6a6b82322406630ed30547e844 (patch)
tree574c2ad4fee17b8ab5d3dc3dc359b16f96de1187 /meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
parent0191456d81500f312569f5813f8c4d5ddadc17a7 (diff)
downloadopenembedded-core-contrib-610991e483d2cf6a6b82322406630ed30547e844.tar.gz
perl: [WIP] upgrade to 5.26.2timo/perl-5.26.2
Bring in patches from debian, best effort at getting past do_patch task. Needs more work. Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff')
-rw-r--r--meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
index 572f149514..2ceb6e762b 100644
--- a/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
+++ b/meta/recipes-devtools/perl/perl/debian/cpan_definstalldirs.diff
@@ -1,24 +1,24 @@
-From 5ff1f21484aab68efe321ff4ba5d35928f72af96 Mon Sep 17 00:00:00 2001
+From bff3929ba9f07af375c9387c6ebb8d0a37f63cdb Mon Sep 17 00:00:00 2001
From: Brendan O'Dea <bod@debian.org>
Date: Tue, 8 Mar 2005 19:30:38 +1100
-Subject: Provide a sensible INSTALLDIRS default for modules installed from
- CPAN.
+Subject: [PATCH] Provide a sensible INSTALLDIRS default for modules installed
+ from CPAN.
Some modules which are included in core set INSTALLDIRS => 'perl'
explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC
ordering, but not ours.
Patch-Name: debian/cpan_definstalldirs.diff
-Upstream-Status: Pending
+
---
cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
-index 918e009..33054cd 100644
+index 531c115..3ccaeec 100644
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
-@@ -1024,7 +1024,7 @@ sub init {
+@@ -1033,7 +1033,7 @@ sub init {
my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
@@ -27,7 +27,7 @@ index 918e009..33054cd 100644
my_dflt_prompt(make_arg => "", $matcher);
if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
$CPAN::Frontend->mywarn(
-@@ -1056,7 +1056,7 @@ sub init {
+@@ -1065,7 +1065,7 @@ sub init {
my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
$matcher);