Bug#817586: most package failed to build on arm64 + ppc64el

2016-08-04 Thread Benj. Mako Hill

> Here's the patch against the -2.4 NMU

Looks good to me.

Later,
Mako


-- 
Benjamin Mako Hill
http://mako.cc/

Creativity can be a social contribution, but only in so far
as society is free to use the results. --GNU Manifesto


signature.asc
Description: PGP signature


Bug#817586: most package failed to build on arm64 + ppc64el

2016-08-04 Thread Wookey
On 2016-08-04 08:39 +0200, Michael Prokop wrote:
> Hi!
> 
> The most package didn't make it to stretch/testing yet because of:
> 
> | % grep-excuses most
> | most (- to 5.0.0a-2.4)
> | Maintainer: Benjamin Mako Hill
> | 12 days old (needed 5 days)
> | missing build on arm64: most (from 5.0.0a-2.3)
> | missing build on ppc64el: most (from 5.0.0a-2.3)
> | Not considered
> 
> There are build failures on arm64 + ppc64el, just wanted to clarify
> whether you're aware of that and if someone is taking care of it?

OK. I just uploaded 5.0.0a-2.5 which uses plain dh_autotools-dev instead of 
dh_autoreconf.

I tested the build on arm64 to check I got it right this time!

Because the configure.ac was in a sub-dir the simple dh_autoreconf
wasn't doing anything. Adding a debian/autoreconf file listing the
'autoreconf' directory to get it to look in there revealed a load of
grumbling about the very old autofoo, with a selection of JD macros to
make it more interesting. Updating that would require some effort. As
it's not actually broken I just decided to use dh_autotools-dev to
update config.{sub,guess}

Here's the patch against the -2.4 NMU

diff -Nru most-5.0.0a/debian/changelog most-5.0.0a/debian/changelog
--- most-5.0.0a/debian/changelog2016-07-22 01:27:30.0 +0100
+++ most-5.0.0a/debian/changelog2016-08-05 00:55:52.0 +0100
@@ -1,3 +1,11 @@
+most (5.0.0a-2.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use dh_autotools_dev instead of dh_autoreconf
+as autoreconf needs a major autofoo update
+
+ -- Wookey   Thu, 04 Aug 2016 23:29:53 +
+
 most (5.0.0a-2.4) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru most-5.0.0a/debian/control most-5.0.0a/debian/control
--- most-5.0.0a/debian/control  2016-07-21 23:56:40.0 +0100
+++ most-5.0.0a/debian/control  2016-08-05 00:31:45.0 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Benjamin Mako Hill  
 Standards-Version: 3.9.8.0
-Build-Depends: debhelper (>=9), autotools-dev, dh-autoreconf, libslang2-dev, 
chrpath
+Build-Depends: debhelper (>=9), autotools-dev, libslang2-dev, chrpath
 
 Package: most
 Architecture: any
diff -Nru most-5.0.0a/debian/rules most-5.0.0a/debian/rules
--- most-5.0.0a/debian/rules2016-07-21 23:24:49.0 +0100
+++ most-5.0.0a/debian/rules2016-08-05 00:32:12.0 +0100
@@ -35,7 +35,7 @@
 build-stamp:
dh_testdir
@echo "Building the binaries ..."
-   dh_autoreconf
+   dh_autotools-dev_updateconfig
CC="$(CC)" CFLAGS="$(CFLAGS)" ./configure 
--with-slanglib=/usr/lib/"$(DEB_HOST_MULTIARCH)"
$(MAKE) SYS_INITFILE=/etc/most.conf
touch $@
@@ -47,7 +47,7 @@
-rm -f build-stamp src/config.h
-rm -f config.log
[ ! -f Makefile ] || $(MAKE) distclean
-   dh_autoreconf_clean
+   dh_autotools-dev_restoreconfig
dh_clean
 
 


Wookey
-- 
Principal hats:  Linaro, Debian, Wookware, ARM
http://wookware.org/


signature.asc
Description: Digital signature