[debhelper-devel] [Git][debian/debhelper][master] makefile: Use -Oline instead of -O

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
41a22f56 by Niels Thykier at 2018-04-04T18:17:24+00:00
makefile: Use -Oline instead of -O

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem/makefile.pm


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ debhelper (11.1.7) UNRELEASED; urgency=medium
   * debhelper.7: Add a ~ to the suggested Build-Depends to ensure
     backports also work for debhelper with single integer versions.
     Thanks to Trent W. Buck for the suggestion.  (Closes: #894666)
+  * makefile.pm: Use -Oline with make.  This avoids make mistaking
+    a target name for a value for -O and should make build time
+    outs less likely for "long" targets.  (Closes: #894573)
 
   [ Nicolas Boulenguez ]
   * dh_installxfonts: Fix typo that causes a misc:Depends on


=====================================
lib/Debian/Debhelper/Buildsystem/makefile.pm
=====================================
--- a/lib/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/lib/Debian/Debhelper/Buildsystem/makefile.pm
@@ -86,7 +86,7 @@ sub do_make {
 		$parallel = '' if $parallel == 0;
 		# -O is for synchronizing the output; only if STDOUT
 		# is not a TTY
-		unshift(@_, '-O') if not -t STDOUT;
+		unshift(@_, '-Oline') if not -t STDOUT;
 		unshift(@_, "-j${parallel}");
 	} else {
 		unshift(@_, '-j1');



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/41a22f56335382a6711c5b1b6362fc5f84be6f77

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/41a22f56335382a6711c5b1b6362fc5f84be6f77
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180404/fe83574b/attachment-0001.html>