r67119 - in /trunk/liblocal-lib-perl: Changes META.yml Makefile.PL debian/changelog lib/local/lib.pm
carnil at users.alioth.debian.org
carnil at users.alioth.debian.org
Fri Jan 7 07:34:06 UTC 2011
Author: carnil
Date: Fri Jan 7 07:33:54 2011
New Revision: 67119
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=67119
Log:
New upstream release
Modified:
trunk/liblocal-lib-perl/Changes
trunk/liblocal-lib-perl/META.yml
trunk/liblocal-lib-perl/Makefile.PL
trunk/liblocal-lib-perl/debian/changelog
trunk/liblocal-lib-perl/lib/local/lib.pm
Modified: trunk/liblocal-lib-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/Changes?rev=67119&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/Changes (original)
+++ trunk/liblocal-lib-perl/Changes Fri Jan 7 07:33:54 2011
@@ -1,4 +1,12 @@
Revision history for local::lib
+
+1.008000
+ - Remove redundant prereqs now that Module::Build 0.36 is required
+ - Makefile.PL avoids CPAN client configuration when not required
+ - print_environment_vars_for() refactored with separate function
+ environment_vars_string_for()
+ - PERL_LOCAL_LIB_ROOT environment is added to disambiguate when
+ PERL_MM_OPT, etc. was set by local::lib or other means
1.007000 2010-12-09
- Chase the Module::Build version which supports PERL_MB_OPT. Thanks to
Modified: trunk/liblocal-lib-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/META.yml?rev=67119&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/META.yml (original)
+++ trunk/liblocal-lib-perl/META.yml Fri Jan 7 07:33:54 2011
@@ -20,12 +20,10 @@
- xt
requires:
CPAN: 1.82
- ExtUtils::CBuilder: 0
ExtUtils::Install: 1.43
ExtUtils::MakeMaker: 6.31
- ExtUtils::ParseXS: 0
Module::Build: 0.36
perl: 5.8.1
resources:
license: http://dev.perl.org/licenses/
-version: 1.007000
+version: 1.008000
Modified: trunk/liblocal-lib-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/Makefile.PL?rev=67119&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/Makefile.PL (original)
+++ trunk/liblocal-lib-perl/Makefile.PL Fri Jan 7 07:33:54 2011
@@ -92,7 +92,8 @@
my $cpan = $? >> 8;
my $cpan_command = '';
- system($^X, '-MCPAN', '-e',
+ my $did_cpan_config = 0;
+ my $cpan_config_command =
'my $done; require ExtUtils::MakeMaker;
my $orig = ExtUtils::MakeMaker->can("prompt");
*ExtUtils::MakeMaker::prompt = sub ($;$) {
@@ -121,8 +122,7 @@
delete @{$CPAN::Config}{keys %$CPAN::Config};
$CPAN::Config->{urllist} = $save;
CPAN::Config->init;
- }'
- );
+ }';
$ENV{PERL_MM_USE_DEFAULT} = 1;
@@ -138,6 +138,8 @@
$cpan_command .= 'force("install","CPAN"); ';
}
if(length $cpan_command) {
+ system($^X, '-MCPAN', '-e', $cpan_config_command);
+ $did_cpan_config++;
system($^X, '-MCPAN', '-e', $cpan_command);
}
if ($cpan) {
@@ -147,6 +149,8 @@
# if we call this code directly, the changes get written to
# $BOOTSTRAP/lib/perl5/CPAN/Config.pm, not where the user expects them to
# be in their ~/.cpan/CPAN/MyConfig.pm.
+ system($^X, '-MCPAN', '-e', $cpan_config_command)
+ unless $did_cpan_config;
system($^X, '-MCPAN',
'-e',
q[CPAN::HandleConfig->load;],
@@ -172,8 +176,6 @@
requires 'ExtUtils::MakeMaker' => '6.31'; # version INSTALL_BASE was added
requires 'ExtUtils::Install' => '1.43'; # ditto
-requires 'ExtUtils::CBuilder'; # this and ParseXS are needed for MB C_support
-requires 'ExtUtils::ParseXS';
requires 'Module::Build' => '0.36'; # PERL_MB_OPT
my $required_CPAN = '1.82';
requires 'CPAN' => $required_CPAN; # sudo support + CPAN::HandleConfig
@@ -200,25 +202,27 @@
# It will already be installed by the time we reach here if bootstrapping,
# otherwise, if we're running from CPAN then it will be installed soon
# enough, and we'll come back here..
- if (!$@) {
- CPAN::HandleConfig->load;
- for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
- if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
- die <<"DEATH";
+ if (!$@ ) {
+ CPAN::HandleConfig->require_myconfig_or_config;
+ if ( $CPAN::Config ) {
+ for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+ if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+ die <<"DEATH";
WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
known to cause problems with local::lib. Please either remove this setting or
clear out your .cpan directory.
DEATH
+ }
}
- }
-
- for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
- if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
- die <<"DEATH";
+
+ for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+ if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+ die <<"DEATH";
WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
known to cause problems with local::lib. Please either remove this setting or
clear out your .cpan directory.
DEATH
+ }
}
}
}
Modified: trunk/liblocal-lib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/debian/changelog?rev=67119&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/debian/changelog (original)
+++ trunk/liblocal-lib-perl/debian/changelog Fri Jan 7 07:33:54 2011
@@ -1,3 +1,9 @@
+liblocal-lib-perl (1.008000-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Salvatore Bonaccorso <carnil at debian.org> Fri, 07 Jan 2011 08:32:17 +0100
+
liblocal-lib-perl (1.007000-1) unstable; urgency=low
* New upstream release
Modified: trunk/liblocal-lib-perl/lib/local/lib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblocal-lib-perl/lib/local/lib.pm?rev=67119&op=diff
==============================================================================
--- trunk/liblocal-lib-perl/lib/local/lib.pm (original)
+++ trunk/liblocal-lib-perl/lib/local/lib.pm Fri Jan 7 07:33:54 2011
@@ -11,7 +11,7 @@
use Carp ();
use Config;
-our $VERSION = '1.007000'; # 1.7.0
+our $VERSION = '1.008000'; # 1.7.0
our @KNOWN_FLAGS = qw(--self-contained);
@@ -267,6 +267,11 @@
sub print_environment_vars_for {
my ($class, $path) = @_;
+ print $class->environment_vars_string_for($path);
+}
+
+sub environment_vars_string_for {
+ my ($class, $path) = @_;
my @envs = $class->build_environment_vars_for($path, LITERAL_ENV);
my $out = '';
@@ -283,7 +288,7 @@
$value =~ s/(\\")/\\$1/g;
$out .= $class->${\"build_${shelltype}_env_declaration"}($name, $value);
}
- print $out;
+ return $out;
}
# simple routines that take two arguments: an %ENV key and a value. return
@@ -316,6 +321,7 @@
sub build_environment_vars_for {
my ($class, $path, $interpolate) = @_;
return (
+ PERL_LOCAL_LIB_ROOT => $path,
PERL_MB_OPT => "--install_base ${path}",
PERL_MM_OPT => "INSTALL_BASE=${path}",
PERL5LIB => join($Config{path_sep},
More information about the Pkg-perl-cvs-commits
mailing list