diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-11-19 22:39:13 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-19 23:38:49 +0100 |
| commit | 520624d562e54e8e2c0191fae723e668e3ece6b4 (patch) | |
| tree | 08e9f1b6fdccea1c08f6efd279d84c9f359149d4 | |
| parent | 033752214285a40f21f1ceb00a9e0b68ec8fc84f (diff) | |
do not rerun ./configure causing FTCBFS with newer autotools-dev
If the config.{sub,guess} files we linked in were newer than our
configure script we ended up recreating configure and then rerun it
without all the configuration options which were (potentially) present
for a previous run.
We avoid this by changing to the same ruleset as in the debian/rules
file which compares the config.* files against a stamp file rather than
the configure script itself as its the configuration itself which
depends on all scripts, not configure on the config scripts.
While at it, we also drop the 'make -s dirs' call as we don't need to do
it explicitly here as proper dependencies will take care of it.
Thanks: Helmut Grohne for the detailed bugreport.
Closes: 804923
| -rw-r--r-- | buildlib/configure.mak | 9 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/buildlib/configure.mak b/buildlib/configure.mak index 7052e4c56..6789a9988 100644 --- a/buildlib/configure.mak +++ b/buildlib/configure.mak @@ -13,7 +13,7 @@ BUILDDIR=build .PHONY: startup missing-config-files -startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED)) +startup: $(BUILDDIR)/configure-stamp $(addprefix $(BUILDDIR)/,$(CONVERTED)) # use the files provided from the system instead of carry around # and use (most of the time outdated) copycats @@ -48,14 +48,15 @@ missing-config-files: @echo "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD" exit 100 -configure: aclocal.m4 configure.ac buildlib/config.guess buildlib/config.sub +configure: aclocal.m4 configure.ac autoconf aclocal.m4: $(wildcard buildlib/*.m4) aclocal -I buildlib -$(BUILDDIR)/config.status: configure +$(BUILDDIR)/configure-stamp: configure buildlib/config.guess buildlib/config.sub /usr/bin/test -e $(BUILDDIR) || mkdir $(BUILDDIR) (HERE=`pwd`; cd $(BUILDDIR) && $$HERE/configure) + touch $(BUILDDIR)/configure-stamp -$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/config.status +$(addprefix $(BUILDDIR)/,$(CONVERTED)): $(BUILDDIR)/configure-stamp diff --git a/configure.ac b/configure.ac index 77e280231..1f110d4c2 100644 --- a/configure.ac +++ b/configure.ac @@ -211,5 +211,4 @@ AC_SUBST(USE_NLS) AC_PATH_PROG(BASH, bash) AC_CONFIG_FILES([environment.mak:buildlib/environment.mak.in makefile:buildlib/makefile.in doc/Doxyfile:doc/Doxyfile.in]) -AC_CONFIG_COMMANDS([default],[make -s dirs],[]) AC_OUTPUT diff --git a/debian/rules b/debian/rules index 60966b09f..c8e7cb285 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ build/environment.mak: build/configure-stamp configure: configure.ac build/configure-stamp: configure buildlib/config.sub buildlib/config.guess dh_testdir - -mkdir build + mkdir -p build cp COPYING debian/copyright cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ |