diff options
author | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2014-10-16 03:05:19 +0200 |
commit | c527fd1f14c27855a37f2e8ac5346ce8d940ced2 (patch) | |
tree | bb002c1fdf011c41dbd2f0927bed23ecb5f83c97 /meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff | |
download | poky-c527fd1f14c27855a37f2e8ac5346ce8d940ced2.tar.gz |
initial commit for Enea Linux 4.0-140929daisy-140929
Migrated from the internal git server on the daisy-enea-point-release branch
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff new file mode 100644 index 0000000000..57e7636be3 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/cpan_definstalldirs.diff | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be Mon Sep 17 00:00:00 2001 | ||
3 | From: Brendan O'Dea <bod@debian.org> | ||
4 | Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
5 | Subject: Provide a sensible INSTALLDIRS default for modules installed from | ||
6 | CPAN. | ||
7 | |||
8 | Some modules which are included in core set INSTALLDIRS => 'perl' | ||
9 | explicitly in Makefile.PL or Build.PL. This makes sense for the normal @INC | ||
10 | ordering, but not ours. | ||
11 | |||
12 | Patch-Name: debian/cpan_definstalldirs.diff | ||
13 | --- | ||
14 | cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++-- | ||
15 | 1 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
18 | index 667bdca..c38c890 100644 | ||
19 | --- a/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
20 | +++ b/cpan/CPAN/lib/CPAN/FirstTime.pm | ||
21 | @@ -990,7 +990,7 @@ sub init { | ||
22 | my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); | ||
23 | |||
24 | if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) { | ||
25 | - my_dflt_prompt(makepl_arg => "", $matcher); | ||
26 | + my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher); | ||
27 | my_dflt_prompt(make_arg => "", $matcher); | ||
28 | if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) { | ||
29 | $CPAN::Frontend->mywarn( | ||
30 | @@ -1022,7 +1022,7 @@ sub init { | ||
31 | my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "", | ||
32 | $matcher); | ||
33 | |||
34 | - my_dflt_prompt(mbuildpl_arg => "", $matcher); | ||
35 | + my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher); | ||
36 | my_dflt_prompt(mbuild_arg => "", $matcher); | ||
37 | |||
38 | if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command} | ||