diff options
| author | Remi Collet <remi@remirepo.net> | 2020-05-20 11:18:03 +0300 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-05-20 11:18:03 +0300 |
| commit | 140b81208e83569913aa81f964eb64e15940d897 (patch) | |
| tree | 5dee4b28e84e210958c963f6d3dfbcdd4c330ba3 | |
| parent | d0de6df83987a7e8e25fab9ba5f274b993c7f094 (diff) | |
| download | unit-140b81208e83569913aa81f964eb64e15940d897.tar.gz unit-140b81208e83569913aa81f964eb64e15940d897.tar.bz2 | |
PHP: building with PHP 8 (development version).
| -rw-r--r-- | auto/modules/php | 6 | ||||
| -rw-r--r-- | src/nxt_php_sapi.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/auto/modules/php b/auto/modules/php index e2e5498a..2cec2f44 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -100,7 +100,11 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then `${NXT_PHP_CONFIG} --libs`" else - NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" + if [ $NXT_PHP_MAJOR_VERSION -ge 8 ]; then + NXT_PHP_LIB="-lphp" + else + NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" + fi if [ "$NXT_PHP_LIB_PATH" != "" ]; then # "php-config --ldflags" does not contain path to libphp, but diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index ccbdd475..d3c23c31 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -29,6 +29,14 @@ #define NXT_PHP7 1 #endif +/* PHP 8 */ +#ifndef TSRMLS_CC +#define TSRMLS_CC +#define TSRMLS_DC +#define TSRMLS_D void +#define TSRMLS_C +#endif + typedef struct { nxt_str_t root; |