Bug#1109422: unblock: bmake/20200710-17
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: bmake@packages.debian.org
Control: affects -1 + src:bmake
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package bmake
[ Reason ]
As pointed out in #1109052, bmake’s autopkgtest was failing, and for a
good reason: debhelper integration broke at one point when GNU make
introduced a change in its jobserver functionality, and that
functionality’s got somehow triggered by the Debian package build
machinery.
[ Impact ]
Not many packages in Debian actually use bmake’s debhelper integration,
but some do, and they may break upon a rebuild.
[ Tests ]
I manually ran autopkgtests.
[ Risks ]
The code change itself is quite trivial: it filters out all MAKEFLAGS
bmake can’t accept. While it could go further and *convert* some of them
(e.g. turn --directory=dir into -C dir), and warn about the rest, it
doesn’t introduce a regression compared to the previous state where
bmake would just loudly fail.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock bmake/20200710-17
diff --git a/debian/bmake.pm b/debian/bmake.pm
index d90daba5791b..a552f0994374 100644
--- a/debian/bmake.pm
+++ b/debian/bmake.pm
@@ -56,6 +56,10 @@ sub do_make {
if ($ENV{MAKEFLAGS} =~ /^[^-]/) {
$ENV{MAKEFLAGS} = "-$ENV{MAKEFLAGS}";
}
+ my @makeflags = grep {
+ !/^--/
+ } split(' ', $ENV{MAKEFLAGS});
+ $ENV{MAKEFLAGS} = join(' ', @makeflags);
}
my @root_cmd;
diff --git a/debian/changelog b/debian/changelog
index 28a6bbf1cae8..ee0dbec71fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bmake (20200710-17) unstable; urgency=medium
+
+ * Sanitise MAKEFLAGS before passing them to bmake which does not
+ support long options (Closes: #1109052).
+
+ -- Andrej Shadura <andrewsh@debian.org> Sun, 13 Jul 2025 17:23:12 +0200
+
bmake (20200710-16) unstable; urgency=medium
[ Debian Janitor ]
Reply to: