Source: indent
Version: 2.2.11-5
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
indent almost cross compiles. It just fails executing texinfo2man, which
is a built tool. Unfortunately, it uses the host architecture compiler
for building texinfo2html. The attached patch fixes that. Please
consider applying it.
Helmut
diff --minimal -Nru indent-2.2.11/debian/changelog
indent-2.2.11/debian/changelog
--- indent-2.2.11/debian/changelog 2017-01-10 17:50:20.000000000 +0100
+++ indent-2.2.11/debian/changelog 2017-06-23 18:32:56.000000000 +0200
@@ -1,3 +1,12 @@
+indent (2.2.11-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Closes: #-1.
+ + 05-cross.patch.
+ + autoreconf.
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 23 Jun 2017 18:32:56 +0200
+
indent (2.2.11-5) unstable; urgency=medium
* Drop 99-config-guess-config-sub, no longer needed when using dh
diff --minimal -Nru indent-2.2.11/debian/control indent-2.2.11/debian/control
--- indent-2.2.11/debian/control 2017-01-10 16:00:00.000000000 +0100
+++ indent-2.2.11/debian/control 2017-06-23 18:32:56.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Santiago Vila <sanv...@debian.org>
Standards-Version: 3.9.8
-Build-Depends: gettext, texi2html, texinfo, debhelper (>=9)
+Build-Depends: gettext, texi2html, texinfo, debhelper (>=9), autoconf-archive,
dh-autoreconf
Package: indent
Architecture: any
diff --minimal -Nru indent-2.2.11/debian/patches/05-cross.patch
indent-2.2.11/debian/patches/05-cross.patch
--- indent-2.2.11/debian/patches/05-cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ indent-2.2.11/debian/patches/05-cross.patch 2017-06-23 18:32:54.000000000
+0200
@@ -0,0 +1,39 @@
+From: Helmut Grohne <hel...@subdivi.de>
+Subject: use the build architecture compiler for build tools
+
+Index: indent-2.2.11/man/Makefile.am
+===================================================================
+--- indent-2.2.11.orig/man/Makefile.am
++++ indent-2.2.11/man/Makefile.am
+@@ -1,15 +1,16 @@
+ mandir = @mandir@
+
+-bin_PROGRAMS = texinfo2man
+-texinfo2man_SOURCES = texinfo2man.c
+ man_MANS = @PACKAGE@.1
+
+-EXTRA_DIST = $(man_MANS) @pack...@.1.in
++EXTRA_DIST = texinfo2man.c $(man_MANS) @pack...@.1.in
+
+ # --------------- Maintainer's Section
+
+ MAINTAINERCLEANFILES = @PACKAGE@.1 Makefile.in texinfo2man
+
++texinfo2man: texinfo2man.c
++ $(CC_FOR_BUILD) -o $@ ${srcdir}/texinfo2man.c
++
+ @PACKAGE@.1: ${srcdir}/@pack...@.1.in ${srcdir}/../doc/@PACKAGE@.texinfo
texinfo2man Makefile.am
+ ./texinfo2man ${srcdir}/@pack...@.1.in
${srcdir}/../doc/@PACKAGE@.texinfo > $@
+
+Index: indent-2.2.11/configure.ac
+===================================================================
+--- indent-2.2.11.orig/configure.ac
++++ indent-2.2.11/configure.ac
+@@ -11,6 +11,7 @@
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
++AX_CC_FOR_BUILD
+
+ AC_AIX
+ AC_MINIX
diff --minimal -Nru indent-2.2.11/debian/patches/series
indent-2.2.11/debian/patches/series
--- indent-2.2.11/debian/patches/series 2017-01-10 16:00:00.000000000 +0100
+++ indent-2.2.11/debian/patches/series 2017-06-23 18:28:37.000000000 +0200
@@ -2,3 +2,4 @@
02-use-lc-all-for-setlocale.patch
03-manpage-in-section-1-not-in-section-1l.patch
04-option-dj-does-not-take-a-parameter.patch
+05-cross.patch
diff --minimal -Nru indent-2.2.11/debian/rules indent-2.2.11/debian/rules
--- indent-2.2.11/debian/rules 2017-01-10 16:00:00.000000000 +0100
+++ indent-2.2.11/debian/rules 2017-06-23 18:32:56.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@
+ dh $@ --with=autoreconf
package = indent
