On 06/05/2014 10:18 AM, Ritesh Raj Sarraf wrote:

> Is this standard practice ? Aren't these autogenerated on the build machine ?

Updating of config.sub and guess and autreconfing was discussed in
this thread where there was a consensus that best practice is to
autoreconf packages at build time, as this will continue to support
new architectures into the future without updating hundrefds of
packages every time a new arch comes out.  (Discussion at
https://lists.debian.org/debian-devel/2014/04/msg00383.html, thread
starting at
https://lists.debian.org/debian-devel/2014/04/msg00342.html)

The details are complicated if you are not intimately familiar with
autotools but no they are not autogenerated - they are supplied with
the package from upstream and thus goout of date over time. Debian
supplies updated versions in autotools-dev and the libtool and
automake packages also have current copies. So an autoreconf will
update them if libtool or automake are used. If only autoconf is used
then you need to use dh_autotools-dev commands or manually copy in
updated versions.

Attached is an updated patch to autoreconf this package properly. It's
a bit fiddly because the configure is in a sub-dir, not the top level
like most programs. Also attached is a simpler patch which just uses
dh_autotools-dev to update config.{sub.guess} only (that works fine
Peter BTW and is recommended over manual copying in any
debhelper-using or dh-using package), but that will fail on the
forthcoming ppc64el arch so it's best to just do it properly now IMHO.

I am doing a pile of NMUs for autotools issues on arm64 at the moment,
and will upload a package with the attached autoreconf patch to
delayed/10 so you can either let it through or discuss this
further. Hope that's OK.

Wookey
-- 
Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/
diff -Nru rxvt-2.7.10/debian/autoreconf rxvt-2.7.10/debian/autoreconf
--- rxvt-2.7.10/debian/autoreconf	1970-01-01 00:00:00.000000000 +0000
+++ rxvt-2.7.10/debian/autoreconf	2014-06-23 20:59:15.000000000 +0000
@@ -0,0 +1 @@
+autoconf
diff -Nru rxvt-2.7.10/debian/changelog rxvt-2.7.10/debian/changelog
--- rxvt-2.7.10/debian/changelog	2013-09-21 22:13:42.000000000 +0000
+++ rxvt-2.7.10/debian/changelog	2014-06-23 22:06:01.000000000 +0000
@@ -1,3 +1,10 @@
+rxvt (1:2.7.10-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use dh-autoreconf in build to support new architectures (Closes: #727501)
+
+ -- Wookey <woo...@debian.org>  Fri, 06 Jun 2014 20:44:21 +0800
+
 rxvt (1:2.7.10-5) unstable; urgency=low
 
   * Applied the following patches which were applied to rxvt-beta:
diff -Nru rxvt-2.7.10/debian/control rxvt-2.7.10/debian/control
--- rxvt-2.7.10/debian/control	2013-07-12 01:33:09.000000000 +0000
+++ rxvt-2.7.10/debian/control	2014-06-23 02:27:59.000000000 +0000
@@ -2,7 +2,7 @@
 Section: x11
 Priority: optional
 Maintainer: George Gensure <wer...@gmail.com>
-Build-Depends: libx11-dev, libxt-dev, libxpm-dev, debhelper (>= 9), autotools-dev
+Build-Depends: libx11-dev, libxt-dev, libxpm-dev, debhelper (>= 9), dh-autoreconf, autotools-dev
 Standards-Version: 3.9.4
 Homepage: http://rxvt.sourceforge.net/
 
diff -Nru rxvt-2.7.10/debian/rules rxvt-2.7.10/debian/rules
--- rxvt-2.7.10/debian/rules	2013-08-29 01:40:18.000000000 +0000
+++ rxvt-2.7.10/debian/rules	2014-06-23 21:47:53.000000000 +0000
@@ -51,6 +51,9 @@
 	[ ! -f Makefile ] || $(MAKE) -i distclean
 	rm -f src/rxvt-xterm src/rxvt-xpm src/krxvt src/grxvt src/crxvt-gb src/crxvt-big5
 	rm -f doc/rxvt.1 rxvt-xterm.1 src/rxvtlib.h doc/Makefile doc/yodl/rxvtRef.yo
+	dh_autoreconf_clean
+	dh_autotools-dev_restoreconfig
+	[ ! -f .configure.orig ] || mv .configure.orig configure
 	dh_clean
 
 build: build-arch build-indep
@@ -60,6 +63,10 @@
 build.stamp:
 	dh_testdir
 
+	dh_autotools-dev_updateconfig
+	dh_autoreconf
+	mv configure .configure.orig
+	cp autoconf/configure .
 	./configure $(CFG_BASE) --without-xpm
 	echo "#define PTYS_ARE_GETPT 1" >> config.h
 	$(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' all clock
diff -Nru rxvt-2.7.10/debian/changelog rxvt-2.7.10/debian/changelog
--- rxvt-2.7.10/debian/changelog	2013-09-21 22:13:42.000000000 +0000
+++ rxvt-2.7.10/debian/changelog	2014-06-23 22:06:52.000000000 +0000
@@ -1,3 +1,10 @@
+rxvt (1:2.7.10-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use autotools-dev in build to support new architectures (Closes: #727501)
+
+ -- Chen Baozi <baoz...@gmail.com>  Fri, 06 Jun 2014 20:44:21 +0800
+
 rxvt (1:2.7.10-5) unstable; urgency=low
 
   * Applied the following patches which were applied to rxvt-beta:
diff -Nru rxvt-2.7.10/debian/rules rxvt-2.7.10/debian/rules
--- rxvt-2.7.10/debian/rules	2013-08-29 01:40:18.000000000 +0000
+++ rxvt-2.7.10/debian/rules	2014-06-23 22:07:52.000000000 +0000
@@ -51,6 +51,7 @@
 	[ ! -f Makefile ] || $(MAKE) -i distclean
 	rm -f src/rxvt-xterm src/rxvt-xpm src/krxvt src/grxvt src/crxvt-gb src/crxvt-big5
 	rm -f doc/rxvt.1 rxvt-xterm.1 src/rxvtlib.h doc/Makefile doc/yodl/rxvtRef.yo
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 build: build-arch build-indep
@@ -60,6 +61,7 @@
 build.stamp:
 	dh_testdir
 
+	dh_autotools-dev_updateconfig
 	./configure $(CFG_BASE) --without-xpm
 	echo "#define PTYS_ARE_GETPT 1" >> config.h
 	$(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' all clock

Reply via email to