debian: Regenerate config.guess using debhelper

This is a change introduced in 5.10.0-2ubuntu2 with the changelog:

> xfsprogs upstream has regressed config.guess, so use
> dh_update_autotools_config.

The 5.10.0 tarball has a config.guess that breaks builds on RISC-V:
...
UNAME_MACHINE = riscv64
UNAME_RELEASE = 5.0.0+
UNAME_SYSTEM  = Linux
UNAME_VERSION = #2 SMP Sat Mar 9 22:34:53 UTC 2019
configure: error: cannot guess build type; you must specify one
make[1]: *** [Makefile:131: include/builddefs] Error 1
...

Reported-by: Steve Langasek <steve.langasek@ubuntu.com>
Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/debian/changelog b/debian/changelog
index 5421aed6ce51b4c8ea7c9ccc1821fc0ca8765fa1..679fbf032c33928baf9870f3c5e3595c1de77597 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfsprogs (5.11.0-rc0-1) experimental; urgency=medium
+
+  [ Steve Langasek ]
+  * Regenerate config.guess using debhelper
+
+ -- Bastian Germann <bastiangermann@fishpost.de>  Sat, 20 Feb 2021 11:57:31 +0100
+
 xfsprogs (5.10.0-3) unstable; urgency=medium
 
   * Drop unused dh-python from Build-Depends (Closes: #981361)

diff --git a/debian/rules b/debian/rules
index c6ca54917cd4447f4b4761dd7c1c0aadc6110dde..fe9a1c3a40f2de90cb42fcd94d80a607d8c2aa9a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ config: .census
        @echo "== dpkg-buildpackage: configure" 1>&2
        $(checkdir)
        AUTOHEADER=/bin/true dh_autoreconf
+       dh_update_autotools_config
        $(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
        touch .census