Bug#735214: libast: use dh-autoreconf instead of autotools-dev to fix FTBFS on ppc64el

[Logan Rosen <logan@ubuntu.com>]

Package: libast
Version: 0.7-6
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

For the ppc64el architecture in Ubuntu, since this package uses libtool, a full
autoreconf is necessary instead of just config.{sub,guess} updates with
autotools-dev. This is because we need new libtool macros for ppc64el.

In Ubuntu, the attached patch was applied to achieve the following:

  * Use dh-autoreconf instead of autotools-dev to also fix FTBFS on ppc64el by
    getting new libtool macros (still updates config.{sub,guess}).
  * Add m4_include([libast.m4]) to configure.in to fix FTBFS.

Thanks for considering the patch.

Logan Rosen



-- System Information:
Debian Release: jessie/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.13.0-2-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru libast-0.7/debian/control libast-0.7/debian/control
--- libast-0.7/debian/control	2011-08-26 11:49:18.000000000 -0400
+++ libast-0.7/debian/control	2014-01-13 15:55:19.000000000 -0500
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: libimlib2-dev, libxt-dev, libxt-dev, cdbs (>= 0.4.93), debhelper (>= 8.3.1), autotools-dev, chrpath
+Build-Depends: libimlib2-dev, libxt-dev, libxt-dev, cdbs (>= 0.4.93), debhelper (>= 8.3.1), dh-autoreconf, chrpath
 Standards-Version: 3.9.2
 Homepage: http://www.eterm.org/
 
diff -Nru libast-0.7/debian/patches/m4_include.patch libast-0.7/debian/patches/m4_include.patch
--- libast-0.7/debian/patches/m4_include.patch	1969-12-31 19:00:00.000000000 -0500
+++ libast-0.7/debian/patches/m4_include.patch	2014-01-11 15:22:55.000000000 -0500
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -22,6 +22,7 @@
+ AM_INIT_AUTOMAKE(libast, 0.7)
+ AC_DEFINE_UNQUOTED(LIBAST_VERSION, "$VERSION", [Version])
+ AM_CONFIG_HEADER(config.h include/libast/sysdefs.h)
++m4_include([libast.m4])
+ 
+ LIBTOOLIZE="${SAVE_LIBTOOLIZE:-libtoolize}"
+ ACLOCAL="${SAVE_ACLOCAL:-aclocal}"
diff -Nru libast-0.7/debian/patches/series libast-0.7/debian/patches/series
--- libast-0.7/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ libast-0.7/debian/patches/series	2014-01-11 15:22:15.000000000 -0500
@@ -0,0 +1 @@
+m4_include.patch
diff -Nru libast-0.7/debian/rules libast-0.7/debian/rules
--- libast-0.7/debian/rules	2011-08-29 08:43:09.000000000 -0400
+++ libast-0.7/debian/rules	2014-01-11 15:18:25.000000000 -0500
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-mmx=no
@@ -10,18 +11,6 @@
 DEB_DH_MAKESHLIBS_ARGS_libast2 = --version-info="libast2 (>= 0.7)"
 DEB_SHLIBDEPS_LIBRARY_package = libast2
 
-makebuilddir::
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-clean::
-	rm -f config.sub
-	rm -f config.guess
-
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	for file in $(wildcard debian/$(cdbs_curpkg)/usr/lib/*/*.so*); do \
 		chrpath -d $$file ; \