[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#737338: libmimedir: use dh-autoreconf to fix FTBFS on ppc64el



Package: libmimedir
Version: 0.5.1-4
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 to fix FTBFS on ppc64el.
  * Update Makefile.in patch to use system libtool, and build-depend on libtool
    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)
diff -Nru libmimedir-0.5.1/debian/control libmimedir-0.5.1/debian/control
--- libmimedir-0.5.1/debian/control	2011-08-23 17:52:10.000000000 -0400
+++ libmimedir-0.5.1/debian/control	2014-02-01 15:27:05.000000000 -0500
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>> 8.0.0), autotools-dev, bison, flex
+Build-Depends: debhelper (>> 8.0.0), autotools-dev, dh-autoreconf, bison, flex, libtool
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/libmimedir
 
diff -Nru libmimedir-0.5.1/debian/patches/01_makefile_in.diff libmimedir-0.5.1/debian/patches/01_makefile_in.diff
--- libmimedir-0.5.1/debian/patches/01_makefile_in.diff	2011-08-23 17:31:13.000000000 -0400
+++ libmimedir-0.5.1/debian/patches/01_makefile_in.diff	2014-01-29 17:00:51.000000000 -0500
@@ -1,8 +1,15 @@
 Add DESDIR support to Makefile.in
-Index: libmimedir-0.5.1/Makefile.in
-===================================================================
---- libmimedir-0.5.1.orig/Makefile.in	2009-02-03 21:29:05.000000000 -0500
-+++ libmimedir-0.5.1/Makefile.in	2009-02-03 21:31:01.000000000 -0500
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14,7 +14,7 @@
+ LEX= @LEX@
+ INSTALL= @INSTALL@
+ RANLIB= @RANLIB@
+-LIBTOOL= @LIBTOOL@
++LIBTOOL= libtool
+ LIBS= -L. libmimedir.la
+ 
+ OBJS= dirlex.o dirsynt.o parse.o get.o dup.o free.o memmem.o add.o count.o del.o
 @@ -55,9 +55,11 @@
  	./test
  
diff -Nru libmimedir-0.5.1/debian/rules libmimedir-0.5.1/debian/rules
--- libmimedir-0.5.1/debian/rules	2011-08-23 17:52:53.000000000 -0400
+++ libmimedir-0.5.1/debian/rules	2014-01-29 17:12:55.000000000 -0500
@@ -22,13 +22,9 @@
 
 config.status: configure
 	dh_testdir
+	dh_autoreconf
+	dh_autotools-dev_updateconfig
 	# Add here commands to configure the package.
-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
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 
@@ -50,8 +46,10 @@
 	#Stupid upstream included Makefile!
 	[ ! -f config.h ] || [ ! -f Makefile ] || $(MAKE) distclean
 
-	rm -f config.sub config.guess Makefile
+	rm -f Makefile
 
+	dh_autotools-dev_restoreconfig
+	dh_autoreconf_clean
 	dh_clean
 
 install: build

Reply to: