On Fri, Dec 13, 2013 at 04:13:27PM +0000, Colin Watson wrote:
> config.guess and config.sub in e2fsprogs 1.42.8 are a bit too old to
> support some new ports properly, such as ppc64el. Could you please
> update them at build time so that we don't have to worry about this in
> future? Patch follows.
This time the hard rock version, with working stamp file handling.
* Use the autotools-dev dh addon to update config.guess/config.sub for new
ports.
diff -Nru e2fsprogs-1.42.8/debian/control e2fsprogs-1.42.8/debian/control
--- e2fsprogs-1.42.8/debian/control 2013-06-21 04:14:38.000000000 +0100
+++ e2fsprogs-1.42.8/debian/control 2013-12-13 16:01:32.000000000 +0000
@@ -2,7 +2,7 @@
Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o <ty...@mit.edu>
-Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config, dietlibc-dev
(>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc],
gcc-multilib [mips mipsel], debhelper (>= 7.0), libblkid-dev (>= 2.16),
uuid-dev (>= 2.16), m4
+Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config, dietlibc-dev
(>> 0.30) [alpha amd64 arm hppa i386 ia64 powerpc ppc64 s390 sparc],
gcc-multilib [mips mipsel], debhelper (>= 7.0), libblkid-dev (>= 2.16),
uuid-dev (>= 2.16), m4, autotools-dev
Standards-Version: 3.9.4
Homepage: http://e2fsprogs.sourceforge.net
diff -Nru e2fsprogs-1.42.8/debian/control.in e2fsprogs-1.42.8/debian/control.in
--- e2fsprogs-1.42.8/debian/control.in 2013-06-16 23:39:06.000000000 +0100
+++ e2fsprogs-1.42.8/debian/control.in 2013-12-13 16:01:27.000000000 +0000
@@ -9,7 +9,7 @@
Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o <ty...@mit.edu>
-Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config,
DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0),
UTIL_LINUX_NG_DEFINES m4
+Build-Depends: texi2html (>= 1.76), gettext, texinfo, pkg-config,
DIETLIBC_DEFINES gcc-multilib [mips mipsel], debhelper (>= 7.0),
UTIL_LINUX_NG_DEFINES m4, autotools-dev
Standards-Version: 3.9.4
Homepage: http://e2fsprogs.sourceforge.net
diff -Nru e2fsprogs-1.42.8/debian/rules e2fsprogs-1.42.8/debian/rules
--- e2fsprogs-1.42.8/debian/rules 2013-06-16 23:39:06.000000000 +0100
+++ e2fsprogs-1.42.8/debian/rules 2013-12-13 18:15:05.000000000 +0000
@@ -100,6 +100,7 @@
endif
STAMPSDIR ?= debian/stampdir
+AUTOTOOLSSTAMP ?= ${STAMPSDIR}/autotools-stamp
CFGSTDSTAMP ?= ${STAMPSDIR}/configure-std-stamp
CFGBFSTAMP ?= ${STAMPSDIR}/configure-bf-stamp
CFGSTATICSTAMP ?= ${STAMPSDIR}/configure-static-stamp
@@ -244,7 +245,12 @@
debian/e2fsprogs.shlibs.local: debian/e2fsprogs.shlibs.local.in
m4 $(M4_ARGS) < debian/e2fsprogs.shlibs.local.in > $@
-${CFGSTDSTAMP}:
+${AUTOTOOLSSTAMP}:
+ dh_autotools-dev_updateconfig
+ mkdir -p ${STAMPSDIR}
+ touch ${AUTOTOOLSSTAMP}
+
+${CFGSTDSTAMP}: ${AUTOTOOLSSTAMP}
dh_testdir
# Make sure we don't try to rebuild the configure scripts
@@ -276,7 +282,7 @@
mkdir -p ${STAMPSDIR}
touch ${CFGSTDSTAMP}
-${CFGBFSTAMP}:
+${CFGBFSTAMP}: ${AUTOTOOLSSTAMP}
dh_testdir
rm -f config.cache
@@ -294,7 +300,7 @@
mkdir -p ${STAMPSDIR}
touch ${CFGBFSTAMP}
-${CFGSTATICSTAMP}:
+${CFGSTATICSTAMP}: ${AUTOTOOLSSTAMP}
dh_testdir
rm -f config.cache
@@ -376,6 +382,7 @@
[ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} V=1
distclean
rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} ${mipsbuilddir}
${mipsbuilddir64}
rm -f debian/*.substvars
+ dh_autotools-dev_restoreconfig
dh_clean
install: cleanup install-std
Thanks,
--
Colin Watson [cjwat...@ubuntu.com]
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
