diff options
| author | Remi Collet <remi@remirepo.net> | 2018-07-20 09:34:12 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-07-20 09:34:12 +0200 |
| commit | 58e897f6927e451b9403b351b96e9c1706cfc07b (patch) | |
| tree | 4965f67a78b117e6b3c951636e9b941834dd5f41 /c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch | |
| parent | 8361bc32709d7249858c61a9a17614fdb3e6323c (diff) | |
add upstream patches for libzookeeper < 3.5
Diffstat (limited to 'c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch')
| -rw-r--r-- | c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch b/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch new file mode 100644 index 0000000..bedc8be --- /dev/null +++ b/c3f9d604adc77bc16601cebd0aabecaf21fb563b.patch @@ -0,0 +1,33 @@ +From c3f9d604adc77bc16601cebd0aabecaf21fb563b Mon Sep 17 00:00:00 2001 +From: Timandes White <timands@gmail.com> +Date: Thu, 19 Jul 2018 11:07:12 +0800 +Subject: [PATCH] Fix path of zookeeper_version.h in config.m4 + +--- + config.m4 | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 5465685..7191109 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -106,13 +106,17 @@ if test "$PHP_ZOOKEEPER" != "no"; then + AC_DEFINE(HAVE_PTHREAD,1,[ ]) + ]) + +- ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}') ++ AC_MSG_CHECKING([whether ZooKeeper Config is enabled]) ++ ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper_version.h |grep ZOO_MINOR_VERSION|awk '{print $3}') + PHP_ZOOKEEPER_CONFIG_FILES="" + if test ${ZOO_MINOR_VERSION} -eq 5; then + PHP_ZOOKEEPER_CONFIG_FILES="php_zookeeper_config_class.c" +- AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library]) ++ AC_MSG_RESULT([enabled]) ++ else ++ AC_MSG_RESULT([disabled]) + fi + ++ AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library]) + PHP_SUBST(ZOOKEEPER_SHARED_LIBADD) + PHP_NEW_EXTENSION(zookeeper, php_zookeeper.c zoo_lock.c $SESSION_EXTRA_FILES php_zookeeper_exceptions.c ${PHP_ZOOKEEPER_CONFIG_FILES} php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES) + |