Skip to content

Commit

Permalink
Prevent PCRE from needing a rebuild/reconf.
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Sacha0 authored and KristofferC committed Mar 23, 2021
1 parent 8448050 commit 2e9532b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion deps/pcre.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 > $@

Expand Down

0 comments on commit 2e9532b

Please sign in to comment.