diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-12-08 16:59:46 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-12-08 16:59:46 +0000 |
| commit | 1af4119d7840484b5cc397c9d1bd7c62e6b897be (patch) | |
| tree | 109721c31e5f0d431ebe830e1bf5957569550ec1 | |
| parent | Update to 3.11.0 (diff) | |
Fix build with PHP 7.4 and unbreak this port
Notes
Notes:
svn path=/head/; revision=519383
| -rw-r--r-- | devel/pecl-zookeeper/Makefile | 1 | ||||
| -rw-r--r-- | devel/pecl-zookeeper/files/patch-php_zookeeper.c | 11 | ||||
| -rw-r--r-- | devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h | 18 |
3 files changed, 29 insertions, 1 deletions
diff --git a/devel/pecl-zookeeper/Makefile b/devel/pecl-zookeeper/Makefile index 054a0b224110..9ba9b1be6f11 100644 --- a/devel/pecl-zookeeper/Makefile +++ b/devel/pecl-zookeeper/Makefile @@ -15,7 +15,6 @@ LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper USES= php:pecl USE_PHP= session:build -IGNORE_WITH_PHP= 74 PORTDATA= zookeeper-api.php diff --git a/devel/pecl-zookeeper/files/patch-php_zookeeper.c b/devel/pecl-zookeeper/files/patch-php_zookeeper.c new file mode 100644 index 000000000000..ae9c07774ae6 --- /dev/null +++ b/devel/pecl-zookeeper/files/patch-php_zookeeper.c @@ -0,0 +1,11 @@ +--- php_zookeeper.c.orig 2019-03-08 00:37:59 UTC ++++ php_zookeeper.c +@@ -1068,7 +1068,7 @@ static void php_parse_acl_list(zval *z_a + { + int size = 0; + int i = 0; +- ulong index = 0; ++ zend_ulong index = 0; + zend_string *key; + zval *entry = NULL; + zval *perms = NULL; diff --git a/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h b/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h new file mode 100644 index 000000000000..a4f8560a22e7 --- /dev/null +++ b/devel/pecl-zookeeper/files/patch-php_zookeeper_callback.h @@ -0,0 +1,18 @@ +--- php_zookeeper_callback.h.orig 2019-03-08 00:37:59 UTC ++++ php_zookeeper_callback.h +@@ -24,7 +24,7 @@ typedef struct _php_cb_data_t { + zend_fcall_info fci; + zend_fcall_info_cache fcc; + zend_bool oneshot; +- ulong h; ++ zend_ulong h; + HashTable *ht; + #if ZTS + void ***ctx; +@@ -34,4 +34,4 @@ typedef struct _php_cb_data_t { + php_cb_data_t* php_cb_data_new(HashTable *ht, zend_fcall_info *fci, zend_fcall_info_cache *fcc, zend_bool oneshot TSRMLS_DC); + void php_cb_data_destroy(php_cb_data_t **entry); + +-#endif /* PHP_ZOOKEEPER_CALLBACK */ +\ No newline at end of file ++#endif /* PHP_ZOOKEEPER_CALLBACK */ |