Upgrade PCRE to 10.23

Add patch for https://bugs.exim.org/show_bug.cgi?id=2067
IntelLabs · Mar 5, 2017 · 05d66d1 · 05d66d1
1 parent 08f00b5
commit 05d66d1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -1,5 +1,5 @@
 LLVM_VER = 3.9.1
-PCRE_VER = 10.22
+PCRE_VER = 10.23
 DSFMT_VER = 2.2.3
 LAPACK_VER = 3.5.0
 ARPACK_VER = 3.3.0

diff --git a/deps/checksums/pcre2-10.22.tar.bz2/md5 b/deps/checksums/pcre2-10.22.tar.bz2/md5
diff --git a/deps/checksums/pcre2-10.22.tar.bz2/sha512 b/deps/checksums/pcre2-10.22.tar.bz2/sha512
diff --git a/deps/checksums/pcre2-10.23.tar.bz2/md5 b/deps/checksums/pcre2-10.23.tar.bz2/md5
@@ -0,0 +1 @@
+b2cd00ca7e24049040099b0a46bb3649
diff --git a/deps/checksums/pcre2-10.23.tar.bz2/sha512 b/deps/checksums/pcre2-10.23.tar.bz2/sha512
@@ -0,0 +1 @@
+3e5910bd2405cc35934d91e4be760abe4f2e900202a20b6ba74adb7a3acb2b74b3bf9b0e97e8de10f8e8534133e0722e0bf0f5fb40d6c2c4520d1ed61749d456
diff --git a/deps/patches/pcre-mingw.patch b/deps/patches/pcre-mingw.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pcre2grep.c b/src/pcre2grep.c
+index e98d743..f00dac2 100644
+--- a/src/pcre2grep.c
++++ b/src/pcre2grep.c
+@@ -628,7 +628,7 @@ z/OS, and "no support". */
+
+ /************* Directory scanning Unix-style and z/OS ***********/
+
+-#if (defined HAVE_SYS_STAT_H && defined HAVE_DIRENT_H && defined HAVE_SYS_TYPES_H) || defined NATIVE_ZOS
++#if ((defined HAVE_SYS_STAT_H && defined HAVE_DIRENT_H && defined HAVE_SYS_TYPES_H) || defined NATIVE_ZOS) && !defined WIN32
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
diff --git a/deps/pcre.mk b/deps/pcre.mk
@@ -13,7 +13,12 @@ $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/source-extracted: $(SRCDIR)/srccache/pcre2-
  touch -c $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/configure # old target
  echo $1 > $@
 
-$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/source-extracted
+# patch for mingw build https://bugs.exim.org/show_bug.cgi?id=2067
+$(SRCDIR)/srccache/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied: $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/source-extracted
+ cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/pcre-mingw.patch
+ echo 1 > $@
+
+$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/source-extracted $(SRCDIR)/srccache/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied
  mkdir -p $(dir $@)
  cd $(dir $@) && \
  $(dir $<)/configure $(CONFIGURE_COMMON) --enable-jit --includedir=$(build_includedir) CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" LDFLAGS="$(LDFLAGS) $(PCRE_LDFLAGS)"