summaryrefslogtreecommitdiff
path: root/Debian/Debhelper/Buildsystem
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-10-29 19:45:06 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-10-29 19:48:51 -0400
commitdb49690fa990eab385d1e6844c285b22c2219f30 (patch)
treebe3872e2888aa019f55a1d9f5032ee02a5e53b45 /Debian/Debhelper/Buildsystem
parenta4a29fb6c4ae999ff732a0b9479a767f685cad2f (diff)
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.
Diffstat (limited to 'Debian/Debhelper/Buildsystem')
-rw-r--r--Debian/Debhelper/Buildsystem/makefile.pm18
1 files changed, 6 insertions, 12 deletions
diff --git a/Debian/Debhelper/Buildsystem/makefile.pm b/Debian/Debhelper/Buildsystem/makefile.pm
index ff904af..704f9c9 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}, @_);
}