diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-11-06 11:21:58 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2020-11-06 11:21:58 +0000 |
| commit | f9f55b43a117805e41f249343b8dbb140f15e0ca (patch) | |
| tree | c66e3141076c69d1f509dc4be5435c2c433fabc5 /databases | |
| parent | d03a5f347142125c7bdf5e293a2ef8bccf8004cd (diff) | |
| download | ports-f9f55b43a117805e41f249343b8dbb140f15e0ca.tar.gz ports-f9f55b43a117805e41f249343b8dbb140f15e0ca.zip | |
Fix build with PHP 8.0
Notes
Notes:
svn path=/head/; revision=554219
Diffstat (limited to 'databases')
5 files changed, 69 insertions, 0 deletions
diff --git a/databases/php-tarantool/files/patch-src-php_tarantool.h b/databases/php-tarantool/files/patch-src-php_tarantool.h new file mode 100644 index 000000000000..c43486477a9c --- /dev/null +++ b/databases/php-tarantool/files/patch-src-php_tarantool.h @@ -0,0 +1,14 @@ +--- src/php_tarantool.h.orig 2020-06-29 22:41:13 UTC ++++ src/php_tarantool.h +@@ -180,7 +180,11 @@ PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_ + PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_ioexception(void); + PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_clienterror(void); + PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_parsingexception(void); ++#if PHP_MAJOR_VERSION >= 8 ++PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception_base(int root); ++#else + PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception_base(int root TSRMLS_DC); ++#endif + + #ifdef ZTS + # define TARANTOOL_G(v) TSRMG(tarantool_globals_id, zend_tarantool_globals *, v) diff --git a/databases/php-tarantool/files/patch-src-tarantool.c b/databases/php-tarantool/files/patch-src-tarantool.c new file mode 100644 index 000000000000..ef3aa0e55cc1 --- /dev/null +++ b/databases/php-tarantool/files/patch-src-tarantool.c @@ -0,0 +1,15 @@ +--- src/tarantool.c.orig 2020-06-29 22:41:13 UTC ++++ src/tarantool.c +@@ -14,6 +14,12 @@ + + #include "utils.h" + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_CC ++#define TSRMLS_DC ++#define TSRMLS_FETCH() ++#endif ++ + static int __tarantool_authenticate(tarantool_connection *obj); + static void tarantool_stream_close(tarantool_connection *obj); + diff --git a/databases/php-tarantool/files/patch-src-tarantool_exception.c b/databases/php-tarantool/files/patch-src-tarantool_exception.c new file mode 100644 index 000000000000..177d221a3f68 --- /dev/null +++ b/databases/php-tarantool/files/patch-src-tarantool_exception.c @@ -0,0 +1,13 @@ +--- src/tarantool_exception.c.orig 2020-06-29 22:41:13 UTC ++++ src/tarantool_exception.c +@@ -4,6 +4,10 @@ + + #include "tarantool_exception.h" + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_DC ++#endif ++ + zend_class_entry *TarantoolException_ptr; + zend_class_entry *TarantoolIOException_ptr; + zend_class_entry *TarantoolClientError_ptr; diff --git a/databases/php-tarantool/files/patch-src-tarantool_msgpack.c b/databases/php-tarantool/files/patch-src-tarantool_msgpack.c new file mode 100644 index 000000000000..ad47e883931a --- /dev/null +++ b/databases/php-tarantool/files/patch-src-tarantool_msgpack.c @@ -0,0 +1,13 @@ +--- src/tarantool_msgpack.c.orig 2020-06-29 22:41:13 UTC ++++ src/tarantool_msgpack.c +@@ -5,6 +5,10 @@ + + #include "third_party/msgpuck.h" + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_FETCH() ++#endif ++ + #ifndef HASH_KEY_NON_EXISTENT + #define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT + #endif /* HASH_KEY_NON_EXISTENT */ diff --git a/databases/php-tarantool/files/patch-src-tarantool_network.c b/databases/php-tarantool/files/patch-src-tarantool_network.c new file mode 100644 index 000000000000..acacf9eb6def --- /dev/null +++ b/databases/php-tarantool/files/patch-src-tarantool_network.c @@ -0,0 +1,14 @@ +--- src/tarantool_network.c.orig 2020-06-29 22:41:13 UTC ++++ src/tarantool_network.c +@@ -11,6 +11,11 @@ + #include "php_tarantool.h" + #include "tarantool_network.h" + ++#if PHP_MAJOR_VERSION >= 8 ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + void double_to_tv(double tm, struct timeval *tv) { + tv->tv_sec = floor(tm); + tv->tv_usec = floor((tm - floor(tm)) * pow(10, 6)); |