From owner-svn-ports-head@freebsd.org Fri Nov 6 11:22:03 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A1782EB0E5; Fri, 6 Nov 2020 11:22:03 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSHzG1w4nz3HBt; Fri, 6 Nov 2020 11:22:02 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 66470243BA; Fri, 6 Nov 2020 11:21:59 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A6BLxoK091328; Fri, 6 Nov 2020 11:21:59 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A6BLwdD091323; Fri, 6 Nov 2020 11:21:58 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202011061121.0A6BLwdD091323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 6 Nov 2020 11:21:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554219 - head/databases/php-tarantool/files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/databases/php-tarantool/files X-SVN-Commit-Revision: 554219 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 11:22:04 -0000 Author: sunpoet Date: Fri Nov 6 11:21:58 2020 New Revision: 554219 URL: https://svnweb.freebsd.org/changeset/ports/554219 Log: Fix build with PHP 8.0 Added: head/databases/php-tarantool/files/ head/databases/php-tarantool/files/patch-src-php_tarantool.h (contents, props changed) head/databases/php-tarantool/files/patch-src-tarantool.c (contents, props changed) head/databases/php-tarantool/files/patch-src-tarantool_exception.c (contents, props changed) head/databases/php-tarantool/files/patch-src-tarantool_msgpack.c (contents, props changed) head/databases/php-tarantool/files/patch-src-tarantool_network.c (contents, props changed) Added: head/databases/php-tarantool/files/patch-src-php_tarantool.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-tarantool/files/patch-src-php_tarantool.h Fri Nov 6 11:21:58 2020 (r554219) @@ -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) Added: head/databases/php-tarantool/files/patch-src-tarantool.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-tarantool/files/patch-src-tarantool.c Fri Nov 6 11:21:58 2020 (r554219) @@ -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); + Added: head/databases/php-tarantool/files/patch-src-tarantool_exception.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-tarantool/files/patch-src-tarantool_exception.c Fri Nov 6 11:21:58 2020 (r554219) @@ -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; Added: head/databases/php-tarantool/files/patch-src-tarantool_msgpack.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-tarantool/files/patch-src-tarantool_msgpack.c Fri Nov 6 11:21:58 2020 (r554219) @@ -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 */ Added: head/databases/php-tarantool/files/patch-src-tarantool_network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/php-tarantool/files/patch-src-tarantool_network.c Fri Nov 6 11:21:58 2020 (r554219) @@ -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));