Skip to content

Commit 2e9532b

Browse files
Sacha0rbvermaa
authored andcommitted
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 <rob.vermaas@gmail.com> (cherry picked from commit 068420b)
1 parent 8448050 commit 2e9532b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/pcre.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted: $(SRCCACHE)/pcre2-$(PCRE_VER).ta
1414
cp $(SRCDIR)/patches/config.sub $(SRCCACHE)/pcre2-$(PCRE_VER)/config.sub
1515
cd $(SRCCACHE)/pcre2-$(PCRE_VER) && patch -p1 -f < $(SRCDIR)/patches/pcre2-cet-flags.patch
1616
# Fix some old targets modified by the patching
17+
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4
1718
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.am
1819
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/Makefile.in
19-
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/aclocal.m4
2020
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/configure
2121
echo $1 > $@
2222

0 commit comments

Comments
 (0)