build: Run autoreconf in the container.

CW-Bug-Id: #15810
This commit is contained in:
Zebediah Figura 2021-09-06 12:24:43 -05:00 committed by Arkadiusz Hiler
parent 4aac973ecf
commit 44d9fb94b2
2 changed files with 7 additions and 6 deletions

View File

@ -669,11 +669,7 @@ $(eval $(call rules-source,wine,$(SRCDIR)/wine))
$(eval $(call rules-autoconf,wine,32)) $(eval $(call rules-autoconf,wine,32))
$(eval $(call rules-autoconf,wine,64)) $(eval $(call rules-autoconf,wine,64))
$(WINE_SRC)/configure: $(SRCDIR)/wine/configure.ac | $(OBJ)/.wine-source $(OBJ)/.wine-post-source:
cd $(WINE_SRC) && autoreconf -fi
touch $@
$(OBJ)/.wine-post-source: $(WINE_SRC)/configure
cd $(WINE_SRC) && tools/make_requests cd $(WINE_SRC) && tools/make_requests
touch $@ touch $@

View File

@ -7,7 +7,12 @@ define create-rules-autoconf
$(call create-rules-common,$(1),$(2),$(3)) $(call create-rules-common,$(1),$(2),$(3))
ifeq ($(CONTAINER),1) ifeq ($(CONTAINER),1)
$$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure.ac $$(OBJ)/.$(1)-pre-configure: $$($(2)_SRC)/configure.ac
@echo ":: autoreconfing $(1)..." >&2
cd "$$($(2)_SRC)" && autoreconf -fiv
touch $$@
$$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure
@echo ":: configuring $(3)bit $(1)..." >&2 @echo ":: configuring $(3)bit $(1)..." >&2
rm -rf "$$($(2)_OBJ$(3))/config.cache" rm -rf "$$($(2)_OBJ$(3))/config.cache"