Hi! On Wed, 2016-06-01 at 17:58:35 +0200, Marc Fournier wrote: > On Mon, May 30, 2016 at 11:06:32AM +0200, Marc Fournier wrote: > > On Sat, May 28, 2016 at 12:43:21PM +0200, Guillem Jover wrote: > > > On Tue, 2015-10-27 at 16:27:24 +0100, Benjamin Drung wrote: > > > > To make it easier to patch Makefile.am after applying patches [1], > > > > please run autoreconf when building collectd. > > > > > > It seems part of this got fixed when fixing #823012, but it still > > > needs some minor changes, otherwise this fails when doing a second > > > build in a row. Attached the needed change to solves this. > > > > I must admit I was initially a bit reluctant to run autoreconf: I ran into > > numerous problems when doing this while setting up the CI pipeline at > > https://ci.collectd.org/. Admittedly mostly when combining ancient autoconf > > versions from legacy distros with the latest collectd code. > > So unfortunately your patch introduces one of these issues: dh_autoreconf > is now run only if "configure" is not found, but as we're patching > "configure.ac", running autoreconf is mandatory. > > What happens then is that it triggers automake by itself, which fails if > there's a version mismatch with the version used to generate the orig > tarball (collectd 5.5.1 was released using 1.14, sid currently comes with > 1.15). > > I have only little time for this this week, so I'm going to upload 5.5.1-4 > without your patch (to fix a lintian error I introduced in -3) in a couple > of minutes. > > Let me know if you come up with a patch solving this problem, else I'll > take a look at this again in a few days.
I think the attached updated patch should cover this too. Thanks, Guillem
From abb2ce5af013ea36204d691453f89ba09b42b377 Mon Sep 17 00:00:00 2001 From: Guillem Jover <[email protected]> Date: Sat, 28 May 2016 12:28:07 +0200 Subject: [PATCH] Split the dh_autoreconf call into a new configure target When the clean target calls dh_autoreconf_clean the configure script gets removed, and debian/rules does not know how to regenerate it, which means the second build in a row will fail. Add an additional dependency to the configure target on configure.ac, so that we regenerate it also when its source changes. Closes: #803163 --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2dd1b35..6d26349 100755 --- a/debian/rules +++ b/debian/rules @@ -157,9 +157,12 @@ ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH))) confflags += --disable-java endif -config.status: configure +configure: configure.ac dh_testdir dh_autoreconf + +config.status: configure + dh_testdir # This is a work-around for #474087 (broken openipmi .pc files). mkdir debian/pkgconfig -- 2.8.1
