From db49690fa990eab385d1e6844c285b22c2219f30 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Oct 2009 19:45:06 -0400 Subject: support unlimited parallel jobs dpkg-buildpackage -j sets DEB_BUILD_OPTIONS=parallel=-1. Policy does not cover this but the intent is to allow unlimited parallel jobs. Also, there is no longer any way for parallel to be set to undef, so remove code to handle that. --- Debian/Debhelper/Buildsystem/makefile.pm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'Debian/Debhelper/Buildsystem') diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm index ff904afd..704f9c95 100644 --- a/Debian/Debhelper/Buildsystem/makefile.pm +++ b/Debian/Debhelper/Buildsystem/makefile.pm @@ -7,8 +7,7 @@ package Debian::Debhelper::Buildsystem::makefile; use strict; -use Debian::Debhelper::Dh_Lib qw(escape_shell is_make_jobserver_unavailable - clean_jobserver_makeflags); +use Debian::Debhelper::Dh_Lib qw(escape_shell clean_jobserver_makeflags); use base 'Debian::Debhelper::Buildsystem'; sub get_makecmd_C { @@ -34,17 +33,12 @@ sub exists_make_target { sub do_make { my $this=shift; - # Avoid warnings about unavailable jobserver. - if (is_make_jobserver_unavailable()) { - clean_jobserver_makeflags(); - } + # Avoid possible warnings about unavailable jobserver, + # and force make to start a new jobserver. + clean_jobserver_makeflags(); - if (defined $this->get_parallel()) { - # Note that this will override any -j settings in MAKEFLAGS. - unshift @_, "-j" . ($this->get_parallel() > 1 ? $this->get_parallel() : 1); - # Force make to start a new jobserver. - clean_jobserver_makeflags(); - } + # Note that this will override any -j settings in MAKEFLAGS. + unshift @_, "-j" . ($this->get_parallel() > 0 ? $this->get_parallel() : ""); $this->doit_in_builddir($this->{makecmd}, @_); } -- cgit v1.2.3