From 9079a240167ae3898597198a81c9c7feb939b6c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Sat, 9 Dec 2023 08:53:50 +0100 Subject: [PATCH] build: Make sure configure uses configure.ac mtime. Since we moved the rsync into the container, configure dependency on configure.ac was broken, leading to it not being regenerated until a second build. This is because timestamps are read by make earlier than the rsync, which runs after the top-level rules are checked. --- make/rules-autoconf.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk index 1f5fb9e9..878640d2 100644 --- a/make/rules-autoconf.mk +++ b/make/rules-autoconf.mk @@ -7,14 +7,11 @@ define create-rules-autoconf $(call create-rules-common,$(1),$(2),$(3),$(4)) -$$($(2)_SRC)/configure.ac: | $$(OBJ)/.$(1)-post-source - -$$(OBJ)/.$(1)-pre-configure: $$($(2)_SRC)/configure.ac +$$($(2)_SRC)/configure: $$($(2)_ORIGIN)/configure.ac | $$(OBJ)/.$(1)-post-source @echo ":: autoreconfing $(1)..." >&2 cd "$$($(2)_SRC)" && autoreconf -fiv - touch $$@ -$$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure +$$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure @echo ":: configuring $(3)bit $(1)..." >&2 rm -rf "$$($(2)_OBJ$(3))/config.cache"