From 72c797eb23a5fcc7d22762476cdc8b5764b9ada7 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 6 Sep 2021 12:24:43 -0500 Subject: [PATCH] build: Run autoreconf in the container. CW-Bug-Id: #15810 --- build/makefile_base.mak | 6 +----- make/rules-autoconf.mk | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 7821137c..ed18bd0d 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -668,11 +668,7 @@ $(eval $(call rules-source,wine,$(SRCDIR)/wine)) $(eval $(call rules-autoconf,wine,32)) $(eval $(call rules-autoconf,wine,64)) -$(WINE_SRC)/configure: $(SRCDIR)/wine/configure.ac | $(OBJ)/.wine-source - cd $(WINE_SRC) && autoreconf -fi - touch $@ - -$(OBJ)/.wine-post-source: $(WINE_SRC)/configure +$(OBJ)/.wine-post-source: cd $(WINE_SRC) && tools/make_requests touch $@ diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk index 80eee674..cbfa3bc4 100644 --- a/make/rules-autoconf.mk +++ b/make/rules-autoconf.mk @@ -9,6 +9,7 @@ $(call create-rules-common,$(1),$(2),$(3)) ifeq ($(CONTAINER),1) $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure.ac @echo ":: configuring $(3)bit $(1)..." >&2 + cd "$$($(2)_SRC)" && autoreconf -fiv rm -rf "$$($(2)_OBJ$(3))/config.cache" cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \