diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff new file mode 100644 index 0000000000..3931c2d357 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.12.3/debian/cpan_definstalldirs.diff | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status:Inappropriate [debian patch] | ||
2 | |||
3 | Subject: Provide a sensible INSTALLDIRS default for modules installed from CPAN. | ||
4 | |||
5 | Some modules which are included in core set INSTALLDIRS => 'perl' | ||
6 | explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC | ||
7 | ordering, but not ours. | ||
8 | |||
9 | |||
10 | --- | ||
11 | cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- | ||
12 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
15 | index 53ffbf1..53976ff 100644 | ||
16 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
17 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
18 | @@ -947,7 +947,7 @@ sub init { | ||
19 | my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); | ||
20 | |||
21 | if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { | ||
22 | - my_dflt_prompt(makepl_arg => "", $matcher); | ||
23 | + my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); | ||
24 | my_dflt_prompt(make_arg => "", $matcher); | ||
25 | if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { | ||
26 | $CPAN::Frontend->mywarn( | ||
27 | @@ -969,7 +969,7 @@ sub init { | ||
28 | my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", | ||
29 | $matcher); | ||
30 | |||
31 | - my_dflt_prompt(mbuildpl_arg => "", $matcher); | ||
32 | + my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); | ||
33 | my_dflt_prompt(mbuild_arg => "", $matcher); | ||
34 | |||
35 | if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} | ||
36 | -- | ||
37 | tg: (a508b62..) debian/cpan_definstalldirs (depends on: upstream) | ||