From 32f37d21fc61f809fdfb20c7e32b946a896f7aea Mon Sep 17 00:00:00 2001 From: Sacha Verweij Date: Wed, 16 Dec 2020 17:29:09 -0500 Subject: [PATCH] Correct pcre2-cet-flags.patch whitespace. pcre2-cet-flags.patch lacks some trailing whitespace that exists in one of the target files. Consequently, the patch does not apply when the patch tool is strict about whitespace. This teensy diff makes the whitespace in pcre2-cet-flags.patch strictly match the whitespace in the target file. Co-Authored-By: Nathan Daly --- deps/patches/pcre2-cet-flags.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/patches/pcre2-cet-flags.patch b/deps/patches/pcre2-cet-flags.patch index e7ed07495ac68..7c455175cdfe3 100644 --- a/deps/patches/pcre2-cet-flags.patch +++ b/deps/patches/pcre2-cet-flags.patch @@ -115,7 +115,7 @@ index 2873912..0ce7004 100644 +@WITH_PCRE2_8_TRUE@ $(VISIBILITY_CFLAGS) $(CET_CFLAGS) \ +@WITH_PCRE2_8_TRUE@ $(AM_CFLAGS) $(am__append_5) \ +@WITH_PCRE2_8_TRUE@ $(am__append_8) - @WITH_PCRE2_8_TRUE@libpcre2_8_la_LIBADD = + @WITH_PCRE2_8_TRUE@libpcre2_8_la_LIBADD = @WITH_PCRE2_16_TRUE@libpcre2_16_la_SOURCES = \ @WITH_PCRE2_16_TRUE@ $(COMMON_SOURCES) @@ -1321,8 +1323,9 @@ COMMON_SOURCES = \ @@ -127,7 +127,7 @@ index 2873912..0ce7004 100644 +@WITH_PCRE2_16_TRUE@ $(VISIBILITY_CFLAGS) $(CET_CFLAGS) \ +@WITH_PCRE2_16_TRUE@ $(AM_CFLAGS) $(am__append_6) \ +@WITH_PCRE2_16_TRUE@ $(am__append_9) - @WITH_PCRE2_16_TRUE@libpcre2_16_la_LIBADD = + @WITH_PCRE2_16_TRUE@libpcre2_16_la_LIBADD = @WITH_PCRE2_32_TRUE@libpcre2_32_la_SOURCES = \ @WITH_PCRE2_32_TRUE@ $(COMMON_SOURCES) @@ -1332,8 +1335,9 @@ COMMON_SOURCES = \ @@ -139,7 +139,7 @@ index 2873912..0ce7004 100644 +@WITH_PCRE2_32_TRUE@ $(VISIBILITY_CFLAGS) $(CET_CFLAGS) \ +@WITH_PCRE2_32_TRUE@ $(AM_CFLAGS) $(am__append_7) \ +@WITH_PCRE2_32_TRUE@ $(am__append_10) - @WITH_PCRE2_32_TRUE@libpcre2_32_la_LIBADD = + @WITH_PCRE2_32_TRUE@libpcre2_32_la_LIBADD = @WITH_PCRE2_8_TRUE@libpcre2_8_la_LDFLAGS = $(EXTRA_LIBPCRE2_8_LDFLAGS) @WITH_PCRE2_16_TRUE@libpcre2_16_la_LDFLAGS = $(EXTRA_LIBPCRE2_16_LDFLAGS) diff --git a/configure b/configure