diff options
Diffstat (limited to 'mysql_xdevapi-build.patch')
| -rw-r--r-- | mysql_xdevapi-build.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/mysql_xdevapi-build.patch b/mysql_xdevapi-build.patch new file mode 100644 index 0000000..c5547ae --- /dev/null +++ b/mysql_xdevapi-build.patch @@ -0,0 +1,29 @@ +diff -up mysql_xdevapi-1.0.0/config.m4.old mysql_xdevapi-1.0.0/config.m4 +--- mysql_xdevapi-1.0.0/config.m4.old 2016-12-08 16:59:44.000000000 +0100 ++++ mysql_xdevapi-1.0.0/config.m4 2016-12-08 17:01:29.000000000 +0100 +@@ -170,15 +170,8 @@ if test "$PHP_MYSQL_XDEVAPI" != "no" || + + + AC_DEFINE([MYSQL_XDEVAPI_SSL_SUPPORTED], 1, [Enable core xmysqlnd SSL code]) ++ AC_DEFINE(MYSQL_XDEVAPI_HAVE_SSL,1,[Enable mysql_xdevapi code that uses OpenSSL directly]) + +- test -z "$PHP_OPENSSL" && PHP_OPENSSL=no +- +- if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then +- AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) +- AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later])) +- +- PHP_SETUP_OPENSSL(MYSQL_XDEVAPI_SHARED_LIBADD, [AC_DEFINE(MYSQL_XDEVAPI_HAVE_SSL,1,[Enable mysql_xdevapi code that uses OpenSSL directly])]) +- fi + + if test "$PHP_MYSQLND" != "yes" && test "$PHP_MYSQLND_ENABLED" != "yes" && test "$PHP_MYSQLI" != "yes" && test "$PHP_MYSQLI" != "mysqlnd"; then + dnl Enable mysqlnd build in case it wasn't passed explicitly in cmd-line +@@ -194,8 +187,6 @@ if test "$PHP_MYSQL_XDEVAPI" != "no" || + + PHP_SUBST(MYSQL_XDEVAPI_SHARED_LIBADD) + +- PHP_ADD_BUILD_DIR($ext_builddir/messages) +- PHP_ADD_BUILD_DIR($ext_builddir/proto_gen) + + this_ext_sources="$xmysqlnd_protobuf_sources $xmysqlnd_expr_parser $xmysqlnd_sources $mysqlx_base_sources $mysqlx_messages" + PHP_NEW_EXTENSION(mysql_xdevapi, $this_ext_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) |