Package: kxl
Version: 1.1.7-16
Severity: normal
Tags: patch
User: [email protected]
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}).
  * Use automake's "foreign" option to fix FTBFS while autoreconfing.

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 -u kxl-1.1.7/debian/rules kxl-1.1.7/debian/rules
--- kxl-1.1.7/debian/rules
+++ kxl-1.1.7/debian/rules
@@ -11,19 +11,13 @@
 build-stamp:
 	dh_testdir
 
-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
-
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch configure.in \
 	&& touch aclocal.m4 \
 	&& touch configure \
 	&& touch config.h.in \
 	&& touch `find . -name Makefile.in`
+	dh_autoreconf
 	./configure --prefix=/usr --mandir=$${prefix}/share/man \
 		--infodir=$${prefix}/share/info
 	$(MAKE)
@@ -36,8 +30,8 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
-	rm -f config.sub config.guess config.log
-
+	rm -f config.log
+	dh_autoreconf_clean
 	dh_clean
 
 install: build
diff -u kxl-1.1.7/debian/control kxl-1.1.7/debian/control
--- kxl-1.1.7/debian/control
+++ kxl-1.1.7/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Sam Hocevar <[email protected]>, Barry deFreese <[email protected]>
-Build-Depends: debhelper (>= 5.0), autotools-dev, quilt, libx11-dev
+Build-Depends: debhelper (>= 5.0), dh-autoreconf, quilt, libx11-dev
 Standards-Version: 3.7.2
 Homepage: http://kxl.orz.hm/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kxl/
diff -u kxl-1.1.7/debian/patches/series kxl-1.1.7/debian/patches/series
--- kxl-1.1.7/debian/patches/series
+++ kxl-1.1.7/debian/patches/series
@@ -9,0 +10 @@
+050_foreign.diff
only in patch2:
unchanged:
--- kxl-1.1.7.orig/debian/patches/050_foreign.diff
+++ kxl-1.1.7/debian/patches/050_foreign.diff
@@ -0,0 +1,12 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(src/KXL.h)
+-AM_INIT_AUTOMAKE(KXL, 1.1.7)
++AC_INIT([KXL], [1.1.7])
++AC_CONFIG_SRCDIR([src/KXL.h])
++AM_INIT_AUTOMAKE([foreign])
+ dnl Checks for programs.
+ AC_PROG_CC
+ AM_PROG_LIBTOOL

Reply via email to