cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use make -C

Browse Source
This commit is contained in:
espie 2015-03-14 20:45:11 +00:00
parent 219ef0298c
commit 8b55e21202
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infrastructure/lib/DPB/Job/Port.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Port.pm,v 1.151 2014/11/22 12:44:37 espie Exp $
# $OpenBSD: Port.pm,v 1.152 2015/03/14 20:45:11 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -133,7 +133,6 @@ sub run
unshift(@args, @l);
$core->shell
->chdir($ports)
->sudo($self->{sudo})
->env(SUBDIR => $fullpkgpath,
PHASE => $t,

4
infrastructure/lib/DPB/State.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: State.pm,v 1.8 2014/03/17 10:48:40 espie Exp $
# $OpenBSD: State.pm,v 1.9 2015/03/14 20:45:11 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -202,7 +202,7 @@ sub make
sub make_args
{
my $self = shift;
my @l = ($self->{make});
my @l = ($self->{make}, "-C", $self->{ports});
if ($self->{build_once}) {
push(@l, 'BUILD_ONCE=Yes');
}

8
infrastructure/lib/DPB/Vars.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Vars.pm,v 1.40 2014/12/07 15:18:50 espie Exp $
# $OpenBSD: Vars.pm,v 1.41 2015/03/14 20:45:11 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -29,9 +29,6 @@ sub run_command
{
my ($class, $core, $shell, $grabber, $subdirs, @args) = @_;
my $ports = $grabber->ports;
$shell->chdir($ports);
if (defined $subdirs) {
$shell->env(SUBDIR => $class->subdirlist($subdirs));
}
@ -83,8 +80,7 @@ EOT
} else {
close STDIN;
open(STDIN, '<&', $rh);
$shell->chdir('/')
->exec($make, '-f', '-', 'print-data');
$shell->exec($make, '-C', '/', '-f', '-', 'print-data');
DPB::Util->die("oops couldn't exec $make");
}
return @list;