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 /48d54026ef6e448bc91949b279103a313a5b053f.patch | |
| parent | 8361bc32709d7249858c61a9a17614fdb3e6323c (diff) | |
add upstream patches for libzookeeper < 3.5
Diffstat (limited to '48d54026ef6e448bc91949b279103a313a5b053f.patch')
| -rw-r--r-- | 48d54026ef6e448bc91949b279103a313a5b053f.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/48d54026ef6e448bc91949b279103a313a5b053f.patch b/48d54026ef6e448bc91949b279103a313a5b053f.patch new file mode 100644 index 0000000..64654e4 --- /dev/null +++ b/48d54026ef6e448bc91949b279103a313a5b053f.patch @@ -0,0 +1,31 @@ +From 48d54026ef6e448bc91949b279103a313a5b053f Mon Sep 17 00:00:00 2001 +From: Timandes White <timands@gmail.com> +Date: Thu, 19 Jul 2018 10:12:23 +0800 +Subject: [PATCH] Try to fix 'undefined symbol: zoo_wgetconfig' (#22) + +--- + config.m4 | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/config.m4 b/config.m4 +index d7fed5a..5465685 100644 +--- a/config.m4 ++++ b/config.m4 +@@ -106,9 +106,15 @@ if test "$PHP_ZOOKEEPER" != "no"; then + AC_DEFINE(HAVE_PTHREAD,1,[ ]) + ]) + +- AC_DEFINE(THREADED,1,[Must define this constant after zookeeper-3.5.0 to use multi-threaded library]) ++ ZOO_MINOR_VERSION=$(cat ${PHP_LIBZOOKEEPER_INCDIR}/zookeeper/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]) ++ fi ++ + 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_class.c php_zookeeper_stat.c php_zookeeper_callback.c php_zookeeper_log.c, $ext_shared,,$SESSION_INCLUDES) ++ 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) + + fi + |