[Reproducible-commits] [dpkg] 17/40: dpkg-buildpackage: Make -j override any parallel option in DEB_BUILD_OPTIONS

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 734381f8f57cdf78ebf7c62b58698b59ad96434f
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Feb 1 23:24:38 2015 +0100

    dpkg-buildpackage: Make -j override any parallel option in DEB_BUILD_OPTIONS
    
    The commit a24fa4c525934922a6035470556051d50ad4da02 changed the
    semantics in the opposite direction. Which does not make any sense
    at all, and goes against any current practice.
---
 debian/changelog             | 2 ++
 man/dpkg-buildpackage.1      | 5 ++---
 scripts/dpkg-buildpackage.pl | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d948bac..ed22e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.18.1) UNRELEASED; urgency=low
   * Fix setting the SE Linux context when a file has a statoverride.
     Closes: #786435
   * Set the SE Linux file context even when the file mode has no file type.
+  * Make dpkg-buildpackage -j override any parallel option specified in
+    DEB_BUILD_OPTIONS. Regression introduced in dpkg 1.14.15.
   * Perl modules:
     - Add missing strict and warnings pragmas for submodules.
     - Use non-destructive substitutions inside map.
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index 1415644..d1a49b8 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -193,9 +193,8 @@ failures.
 Also adds \fBparallel=\fP\fIjobs\fP or
 \fBparallel\fP to the \fBDEB_BUILD_OPTIONS\fP environment variable which
 allows debian/rules files to use this information for their own purposes.
-The \fB\%parallel=\fP\fIjobs\fP or \fBparallel\fP option in
-\fBDEB_BUILD_OPTIONS\fP environment variable will override the \fB\-j\fP
-value if this option is given.
+The \fB\-j\fP value will override the \fBparallel=\fP\fIjobs\fP or
+\fBparallel\fP option in the \fBDEB_BUILD_OPTIONS\fP environment variable.
 Note that the \fBauto\fP value will get replaced by the actual number of
 currently active processors, and as such will not get propagated to any
 child process. If the number of online processors cannot be inferred then
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 8f0d7fe..3b5b9c0 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -395,7 +395,6 @@ if (defined $parallel) {
         $parallel = qx(getconf _NPROC_ONLN 2>/dev/null) if $?;
         chomp $parallel;
     }
-    $parallel = $build_opts->get('parallel') if $build_opts->has('parallel');
     $ENV{MAKEFLAGS} //= '';
     $ENV{MAKEFLAGS} .= " -j$parallel";
     $build_opts->set('parallel', $parallel);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git