Fix build system auto-selection breakage.

[debhelper.git] / dh

diff --git a/dh b/dh
index a233db4a8ef44369ffd521b177e5ce2d775d4256..bd82d44bd4760e6870618cfa9f99b45c754866a2 100755 (executable)
--- a/dh
+++ b/dh
@@ -41,13 +41,6 @@ override target can then run the command with additional options, or run
 entirely different commands instead. (Note that to use this feature,
 you should Build-Depend on debhelper 7.0.50 or above.)
 
-dh passes --parallel to dh_auto_* commands if it detects being run by the
-C<dpkg-buildpackage -jX> command, but a job server of the parent I<make>
-(presumably debian/rules) is not reachable. Nonetheless, it is highly
-recommended to pass --parallel/-j option to dh explicitly to indicate that a
-source package supports parallel building. See L<debhelper(7)/"BUILD SYSTEM
-OPTIONS"> for more information.
-
 =head1 OPTIONS
 
 =over 4
@@ -229,24 +222,14 @@ init(options => {
        },
        "l" => \$dh{LIST},
        "list" => \$dh{LIST},
-       "j:i" => \$dh{PARALLEL},
-       "parallel:i" => \$dh{PARALLEL},
 });
 inhibit_log();
 
-# Parallel defaults to "unset" unless unavailable --jobserver-fds is detected
-# in MAKEFLAGS. This typically means dpkg-buildpackage was called with a -jX
-# option. Then -jX in MAKEFLAGS gets "consumed" by make invocation of
-# debian/rules and "converted" to --jobserver-fds.  If jobserver is
-# unavailable, dh was probably called via debian/rules without "+" prefix (so
-# make has closed jobserver FDs). In such a case, MAKEFLAGS is cleaned from the
-# offending --jobserver-fds option in order to prevent further make invocations
-# from spitting warnings and disabling job support.
+# If make is using a jobserver, but it is not available
+# to this process, clean out MAKEFLAGS. This avoids
+# ugly warnings when calling make.
 if (is_make_jobserver_unavailable()) {
-       clean_makeflags();
-       # Enable parallel (no maximum) if the package doesn't since it appears this
-       # dh is called via dpkg-buildpackage -jX.
-       $dh{PARALLEL} = 0 if !defined $dh{PARALLEL};
+       clean_jobserver_makeflags();
 }
 
 # Definitions of sequences.
@@ -455,12 +438,7 @@ while (@ARGV_orig) {
                shift @ARGV_orig;
                next;
        }
-       elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without|parallel)=)/) {
-               next;
-       }
-       elsif ($opt =~ /^(-j|--parallel)$/) {
-               # Argument to -j/--parallel is optional.
-               shift @ARGV_orig if @ARGV_orig > 0 && $ARGV_orig[0] =~ /^\d+$/;
+       elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without)=)/) {
                next;
        }
        push @options, $opt;
@@ -541,12 +519,6 @@ sub run {
        # to prevent them from being acted on.
        push @options, map { "-N$_" } @exclude;
 
-       # Pass --parallel to dh_auto_* commands if requested
-       if (defined $dh{PARALLEL} && ($dh{PARALLEL} == 0 || $dh{PARALLEL} > 1)
-           && $command =~ /^dh_auto_/) {
-               push @options, "--parallel" . ($dh{PARALLEL} > 1 ? "=$dh{PARALLEL}" : "");
-       }
-
        # Check for override targets in debian/rules and
        # run them instead of running the command directly.
        my $override_command;