mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
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>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
Upstream-Status:Inappropriate [debian patch]
|
|
|
|
Subject: 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.
|
|
|
|
|
|
---
|
|
cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
index 53ffbf1..53976ff 100644
|
|
--- a/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
+++ b/cpan/CPAN/lib/CPAN/FirstTime.pm
|
|
@@ -947,7 +947,7 @@ sub init {
|
|
my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
|
|
|
|
if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
|
|
- my_dflt_prompt(makepl_arg => "", $matcher);
|
|
+ my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
|
|
my_dflt_prompt(make_arg => "", $matcher);
|
|
if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
|
|
$CPAN::Frontend->mywarn(
|
|
@@ -969,7 +969,7 @@ sub init {
|
|
my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
|
|
$matcher);
|
|
|
|
- my_dflt_prompt(mbuildpl_arg => "", $matcher);
|
|
+ my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher);
|
|
my_dflt_prompt(mbuild_arg => "", $matcher);
|
|
|
|
if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}
|
|
--
|
|
tg: (a508b62..) debian/cpan_definstalldirs (depends on: upstream)
|