Package: mm
Version: 1.4.2-5
Severity: normal
Tags: patch
User: ubuntu-de...@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 to also fix FTBFS on ppc64el.
  * Disable autoheader to fix FTBFS during autoreconf.
  * Use system libtool, and build-depend on it accordingly.
  * Use autotools-dev dh helper instead of copying files manually.

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-6-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 -u mm-1.4.2/debian/control mm-1.4.2/debian/control
--- mm-1.4.2/debian/control
+++ mm-1.4.2/debian/control
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Mark Brown <broo...@debian.org>
-Build-Depends: debhelper (>= 9), autotools-dev, dpkg-dev (>= 1.16.1)
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, dpkg-dev (>= 1.16.1), libtool
 Standards-Version: 3.9.4
 
 Package: libmm-dev
diff -u mm-1.4.2/debian/rules mm-1.4.2/debian/rules
--- mm-1.4.2/debian/rules
+++ mm-1.4.2/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export AUTOHEADER = true
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -20,14 +21,8 @@
 
 config.status: configure
 	dh_testdir
-
-	if [ ! -f config.sub.save ]; then cp config.sub config.sub.save ; fi
-	if [ ! -f config.guess.save ]; then cp config.guess config.guess.save ; fi
-
-	-test -r /usr/share/misc/config.sub && \
-	  cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	  cp -f /usr/share/misc/config.guess config.guess
+	dh_autotools-dev_updateconfig
+	dh_autoreconf
 
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-shm=IPCSHM
 
@@ -48,11 +43,8 @@
 
 	if [ -f Makefile ]; then $(MAKE) distclean ; fi
 
-	-test -r config.sub.save && \
-	  mv config.sub.save config.sub
-	-test -r config.guess.save && \
-	  mv config.guess.save config.guess
-
+	dh_autoreconf_clean
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 install: build
only in patch2:
unchanged:
--- mm-1.4.2.orig/Makefile.in
+++ mm-1.4.2/Makefile.in
@@ -57,7 +57,7 @@
 LDFLAGS     = @LDFLAGS@
 LIBS        = @LIBS@
 RM          = rm -f
-LIBTOOL     = ./libtool
+LIBTOOL     = libtool --tag=cc
 SHTOOL      = ./shtool
 
 LIBS        = libmm.la

Reply via email to