Do not automatically enable -j if DEB_BUILD_OPTIONS contains parallel=n

Allow overriding its value from the environment. Closes: #458589

diff --git a/ChangeLog b/ChangeLog
index 883e436824bc10ba80540315514dc7800871c524..698155256b5c4b13afd9e8f57b53bc3ccfa226c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-03  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-buildpackage.pl: Do not automatically enable '-j'
+       if DEB_BUILD_OPTIONS contains parallel=n, and allow overriding
+       its value from the environment.
+
 2008-01-02  Guillem Jover  <guillem@debian.org>
 
        * utils/start-stop-daemon.c [!__GNUC__] (fatal, badusage): Remove

diff --git a/debian/changelog b/debian/changelog
index 0516343339c238528a4abff2cbc1ab180a114994..7b8f0246971fe98fe613f1b1bee6a1eedf11eedc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ dpkg (1.14.15) UNRELEASED; urgency=low
     compressed sources. Closes: #458519
   * Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521
   * Add lzma to dpkg-dev Depends.
+  * Do not automatically enable -j if DEB_BUILD_OPTIONS contains parallel=n,
+    and allow overriding its value from the environment. Closes: #458589
 
   [ Updated dpkg translations ]
   * Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918, #458732

diff --git a/man/ChangeLog b/man/ChangeLog
index c18032352f2d6d204cb61271b0aa237e86852588..76f7fab45561a2468c2479d3069be266e6d9a960 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-03  Guillem Jover  <guillem@debian.org>
+
+       * dpkg-buildpackage.1: Document new -j behaviour.
+
 2008-01-02  Christian Perrier  <bubulle@debian.org>
 
        * po/fr.po: converted to UTF-8. Updated to 1171t139f74u

diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index 504145703c584fa1c99ce999a97bb54de44ce4a2..2a84119e7bdc6a61e41e2a1e8f53c739eb479dbb 100644 (file)
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2007-09-28" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2008-01-03" "Debian Project" "dpkg utilities"
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 .
@@ -55,8 +55,8 @@ environment variable, which should cause all subsequent make
 invocations to inherit the option. Also adds \fBparallel=\fP\fIjobs\fP
 to the DEB_BUILD_OPTIONS environment variable which allows
 debian/rules files to use this information for their own purposes.
-If no \fB-j\fP option is given, an existing value for \fBparallel\fP will be
-honoured and added to MAKEFLAGS.
+The \fBparallel=\fP\fIjobs\fP in DEB_BUILD_OPTIONS environment variable
+will override the \fB-j\fP value if this option is given.
 .TP
 .BI \-v version
 Use changelog information from all versions strictly later than

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index dfa0041b7cc57ab81b7fc3e69513d2cfd8e2cf17..84b984b59822db3f08591f1776f49976b95665ac 100755 (executable)
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -241,17 +241,15 @@ if ($signcommand && ($signinterface !~ /^(gpg|pgp)$/)) {
     warning(_g("unknown sign command, assuming pgp style interface"));
 }
 
-if ($parallel || $ENV{DEB_BUILD_OPTIONS}) {
+if ($parallel) {
     my $build_opts = Dpkg::BuildOptions::parse();
 
-    $parallel ||= $build_opts->{parallel};
-    if (defined $parallel) {
-       $ENV{MAKEFLAGS} ||= '';
-       if ($parallel eq '-1') {
-           $ENV{MAKEFLAGS} .= " -j";
-       } else {
-           $ENV{MAKEFLAGS} .= " -j$parallel";
-       }
+    $parallel = $build_opts->{parallel} if (defined $build_opts->{parallel});
+    $ENV{MAKEFLAGS} ||= '';
+    if ($parallel eq '-1') {
+       $ENV{MAKEFLAGS} .= " -j";
+    } else {
+       $ENV{MAKEFLAGS} .= " -j$parallel";
     }
     $build_opts->{parallel} = $parallel;
     Dpkg::BuildOptions::set($build_opts);