@@ -, +, @@ --- .gear/php-pcre-jit.patch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 .gear/php-pcre-jit.patch --- a/.gear/php-pcre-jit.patch +++ a/.gear/php-pcre-jit.patch @@ -0,0 +1,77 @@ +From 03119df9e1e03c0f751c746eec42b592368a7281 Mon Sep 17 00:00:00 2001 +From: Anatol Belski +Date: Fri, 23 Sep 2016 01:52:42 +0200 +Subject: [PATCH] Fix bug #73121 Bundled PCRE doesn't compile because JIT isn't + supported on s390 + +Adapted for php5 by Michael Shigorin +through dropping chunks for ext/pcre/php_pcre.[ch] +(weren't modified the expected way in the tree). +--- + ext/pcre/config.w32 | 6 ++++++ + ext/pcre/config0.m4 | 12 ++++++++++++ + ext/pcre/pcrelib/config.h | 6 +++++- + 3 files changed, 23 insertions(+), 1 deletion(-) + +diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 +index 594b1cb..7e9832c 100644 +--- a/ext/pcre/config.w32 ++++ b/ext/pcre/config.w32 +@@ -11,3 +11,9 @@ AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library'); + PHP_PCRE="yes"; + PHP_INSTALL_HEADERS("ext/pcre", "php_pcre.h pcrelib/"); + ADD_FLAG("CFLAGS_PCRE", " /D HAVE_CONFIG_H"); ++ ++ARG_WITH("pcre-jit", "Enable PCRE JIT support", "yes"); ++if (PHP_PCRE_JIT != "no") { ++ AC_DEFINE('HAVE_PCRE_JIT_SUPPORT', 1, 'PCRE library'); ++} ++ +diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 +index bfe2009..9e2c98c 100644 +--- a/ext/pcre/config0.m4 ++++ b/ext/pcre/config0.m4 +@@ -66,3 +66,15 @@ PHP_ARG_WITH(pcre-regex,, + PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/]) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) + fi ++ ++PHP_ARG_WITH(pcre-jit,,[ --with-pcre-jit Enable PCRE JIT functionality], yes, no) ++ if test "$PHP_PCRE_REGEX" != "no"; then ++ AC_MSG_CHECKING([whether to enable PCRE JIT functionality]) ++ if test "$PHP_PCRE_JIT" != "no"; then ++ AC_DEFINE(HAVE_PCRE_JIT_SUPPORT, 1, [ ]) ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ +diff --git a/ext/pcre/pcrelib/config.h b/ext/pcre/pcrelib/config.h +index 0f7a9f7..e3ed148 100644 +--- a/ext/pcre/pcrelib/config.h ++++ b/ext/pcre/pcrelib/config.h +@@ -1,7 +1,9 @@ + + #include + +-#ifndef PHP_WIN32 ++#ifdef PHP_WIN32 ++# include ++#else + # include + #endif + +@@ -397,7 +399,9 @@ them both to 0; an emulation function will be used. */ + #undef SUPPORT_GCOV + + /* Define to any value to enable support for Just-In-Time compiling. */ ++#if HAVE_PCRE_JIT_SUPPORT + #define SUPPORT_JIT ++#endif + + /* Define to any value to allow pcregrep to be linked with libbz2, so that it + is able to handle .bz2 files. */ +-- +2.7.4 + --