technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

PHP: building with PHP 8 (development version).

Browse Source
This commit is contained in:
Remi Collet
2020-05-20 11:18:03 +03:00
parent d0de6df839
commit 140b81208e
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
auto/modules/php
View File

@@ -99,8 +99,12 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
NXT_PHP_LDFLAGS="`${NXT_PHP_CONFIG} --ldflags` \ NXT_PHP_LDFLAGS="`${NXT_PHP_CONFIG} --ldflags` \
`${NXT_PHP_CONFIG} --libs`" `${NXT_PHP_CONFIG} --libs`"
else
if [ $NXT_PHP_MAJOR_VERSION -ge 8 ]; then
NXT_PHP_LIB="-lphp"
else else
NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}"
fi
if [ "$NXT_PHP_LIB_PATH" != "" ]; then if [ "$NXT_PHP_LIB_PATH" != "" ]; then
# "php-config --ldflags" does not contain path to libphp, but # "php-config --ldflags" does not contain path to libphp, but

8
src/nxt_php_sapi.c
View File

@@ -29,6 +29,14 @@
#define NXT_PHP7 1 #define NXT_PHP7 1
#endif #endif
/* PHP 8 */
#ifndef TSRMLS_CC
#define TSRMLS_CC
#define TSRMLS_DC
#define TSRMLS_D void
#define TSRMLS_C
#endif
typedef struct { typedef struct {
nxt_str_t root; nxt_str_t root;