[debhelper-devel] [Git][debian/debhelper][master] makefile.pm: Sort %DEB_DEFAULT_TOOLS arguments

[Niels Thykier]

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
b9c0f907 by Niels Thykier at 2018-01-31T20:23:06+00:00
makefile.pm: Sort %DEB_DEFAULT_TOOLS arguments

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
@@ -29,6 +29,8 @@ debhelper (11.1.4) UNRELEASED; urgency=medium
     actions (such as chown'ing).
   * d/control: Bump dependency on dh-autoreconf to ensure that
     packages do not experience #887482.
+  * makefile.pm: Ensure that command line arguments are passed
+    deterministically to make when cross-compiling.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 21 Jan 2018 08:18:20 +0000
 


=====================================
lib/Debian/Debhelper/Buildsystem/makefile.pm
=====================================
--- a/lib/Debian/Debhelper/Buildsystem/makefile.pm
+++ b/lib/Debian/Debhelper/Buildsystem/makefile.pm
@@ -139,7 +139,8 @@ sub check_auto_buildable {
 sub build {
 	my $this=shift;
 	if (ref($this) eq 'Debian::Debhelper::Buildsystem::makefile' and is_cross_compiling()) {
-		while (my ($var, $tool) = each %DEB_DEFAULT_TOOLS) {
+		for my $var (sort(keys(%DEB_DEFAULT_TOOLS))) {
+			my $tool = $DEB_DEFAULT_TOOLS{$var};
 			if ($ENV{$var}) {
 				unshift @_, $var . "=" . $ENV{$var};
 			} else {



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

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/b9c0f9076d6d174f26655c87f0d4fcade88fc80a
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/20180131/f675c7d9/attachment-0001.html>