From 068420b86564d0729ef8762302f9eec4a264f853 Mon Sep 17 00:00:00 2001 From: Sacha Verweij Date: Tue, 16 Mar 2021 12:35:56 -0400 Subject: [PATCH] Prevent PCRE from needing a rebuild/reconf. This commit reorders a couple touches in deps/pcre.mkl. Those touches are intended to prevent patch application from triggering rebuild/reconf. The present ordering doesn't quite succeed in that objective; patch application triggers rebuild. On systems with compatible autotools, the rebuild succeeds and the build is nonetheless happy. On systems with incompatible versions of autotools, however, the build fails for need of a reconf. The reordering in this commit prevents the rebuild. Co-Authored-By: Rob Vermaas --- deps/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/pcre.mk b/deps/pcre.mk index 70b9e9f96ff02..5294a81a1f1d1 100644 --- a/deps/pcre.mk +++ b/deps/pcre.mk @@ -14,9 +14,9 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted: $(SRCCACHE)/pcre2-$(PCRE_VER).ta cp $(SRCDIR)/patches/config.sub $(SRCCACHE)/pcre2-$(PCRE_VER)/config.sub cd $(SRCCACHE)/pcre2-$(PCRE_VER) && patch -p1 -f < $(SRCDIR)/patches/pcre2-cet-flags.patch # Fix some old targets modified by the patching + touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4 touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.am touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.in - touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4 touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/configure echo $1 > $@