Skip to content

Add "-f Makefile" to initial "make" (no args). Set PERL env var in "make test" and "make" #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rocky wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add "-f Makefile" to initial "make" (no args). Set PERL env var in "make test" and "make" #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fad3b0e
Set PERL env var on "test" and "install"
Jul 4, 2016
c38cffb
Pass -f Makefile in running plain "make"
Jul 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lib/CPAN/Distribution.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@ is part of the perl-%s distribution. To install that, you need to run
return;
}

my $make = $self->{modulebuild} ? "Build" : "make";
my $make = $self->{modulebuild} ? "Build" : "make -f Makefile";
$CPAN::Frontend->myprint(sprintf "Running %s for %s\n", $make, $self->id);
local $ENV{PERL5LIB} = defined($ENV{PERL5LIB})
? $ENV{PERL5LIB}
Expand Down Expand Up @@ -2162,7 +2162,13 @@ is part of the perl-%s distribution. To install that, you need to run
}
$system = join " ", $self->_build_command(), $CPAN::Config->{mbuild_arg};
} else {
$system = join " ", $self->_make_command(), $CPAN::Config->{make_arg};
# ExtUtils::MakeMaker writes a file called Makefile. Explicitly use
# that since GNU make can default to another name, e.g. GNUMakefile.
# Note: -f is in the POSIX spec for make
my @make_args = -f "Makefile" ?
($self->_make_command(), '-f', 'Makefile', $CPAN::Config->{make_arg}) :
($self->_make_command(), $CPAN::Config->{make_arg});
$system = join " ", @make_args;
}
$system =~ s/\s+$//;
my $make_arg = $self->_make_phase_arg("make");
Expand Down Expand Up @@ -2885,7 +2891,7 @@ sub unsat_prereq {
} elsif (
$self->{reqtype} =~ /^(r|c)$/
&& (exists $prereq_pm->{requires}{$need_module} || exists $prereq_pm->{opt_requires} )
&& $nmo
&& $nmo
&& !$inst_file
) {
# continue installing as a prereq; this may be a
Expand Down Expand Up @@ -3458,6 +3464,7 @@ sub test {
# warn "XDEBUG: checking for notest: $self->{notest} $self";
my $make = $self->{modulebuild} ? "Build" : "make";

local $ENV{PERL} = defined $ENV{PERL}? $ENV{PERL} : $^X;
local $ENV{PERL5LIB} = defined($ENV{PERL5LIB})
? $ENV{PERL5LIB}
: ($ENV{PERLLIB} || "");
Expand Down Expand Up @@ -3881,6 +3888,7 @@ sub install {
return;
}

local $ENV{PERL} = defined $ENV{PERL}? $ENV{PERL} : $^X;
my $system;
if (my $commandline = $self->prefs->{install}{commandline}) {
$system = $commandline;
Expand Down