Changeset View
Changeset View
Standalone View
Standalone View
lang/php74/files/patch-configure.ac
| --- configure.ac.orig 2018-01-02 22:35:55 UTC | --- configure.ac.orig 2019-08-06 06:54:06 UTC | ||||
| +++ configure.ac | +++ configure.ac | ||||
| @@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ... | @@ -105,6 +105,7 @@ extern "C++" { | ||||
| #endif | |||||
| #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ | |||||
| #undef PTHREADS | |||||
| +#include <ext/php_config.h> | +#include <ext/php_config.h> | ||||
| #endif /* PHP_CONFIG_H */ | #endif /* PHP_CONFIG_H */ | ||||
| ]) | ]) | ||||
| @@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4) | @@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4) | ||||
| dnl . | |||||
| dnl ------------------------------------------------------------------------- | |||||
| dnl ---------------------------------------------------------------------------- | |||||
| -PTHREADS_CHECK | -PTHREADS_CHECK | ||||
| PHP_HELP_SEPARATOR([SAPI modules:]) | PHP_HELP_SEPARATOR([SAPI modules:]) | ||||
| PHP_SHLIB_SUFFIX_NAMES | PHP_SHLIB_SUFFIX_NAMES | ||||
| PHP_BUILD_PROGRAM | PHP_BUILD_PROGRAM | ||||
| @@ -370,15 +370,9 @@ else | @@ -654,7 +654,7 @@ memmem \ | ||||
| AC_MSG_RESULT([none]) | AX_FUNC_WHICH_GETHOSTBYNAME_R | ||||
| fi | |||||
| -dnl Exit early | dnl Some systems (like OpenSolaris) do not have nanosleep in libc. | ||||
| -if test -z "$PHP_INSTALLED_SAPIS"; then | |||||
| - AC_MSG_ERROR([Nothing to build.]) | |||||
| -fi | |||||
| - | |||||
| dnl force ZTS | |||||
| if test "$enable_maintainer_zts" = "yes"; then | |||||
| PTHREADS_ASSIGN_VARS | |||||
| - PTHREADS_FLAGS | |||||
| fi | |||||
| dnl Starting system checks. | |||||
| @@ -682,7 +676,7 @@ nanosleep \ | |||||
| ) | |||||
| dnl Some systems (like OpenSolaris) do not have nanosleep in libc | |||||
| -PHP_CHECK_FUNC_LIB(nanosleep, rt) | -PHP_CHECK_FUNC_LIB(nanosleep, rt) | ||||
| +PHP_CHECK_FUNC(nanosleep, rt) | +PHP_CHECK_FUNC(nanosleep, rt) | ||||
| dnl Check for getaddrinfo, should be a better way, but... | dnl Check for getaddrinfo, should be a better way, but... Also check for working | ||||
| dnl Also check for working getaddrinfo | dnl getaddrinfo. | ||||
| @@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` | @@ -1308,7 +1308,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd | ||||
| EXPANDED_DATADIR=$datadir | EXPANDED_DATADIR=$datadir | ||||
| EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` | EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` | ||||
| EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` | EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` | ||||
| Context not available. | |||||
| exec_prefix=$old_exec_prefix | exec_prefix=$old_exec_prefix | ||||
| libdir=$old_libdir | libdir=$old_libdir | ||||
| @@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets) | @@ -1493,7 +1493,7 @@ PHP_SUBST(all_targets) | ||||
| PHP_SUBST(install_targets) | PHP_SUBST(install_targets) | ||||
| PHP_SUBST(install_binary_targets) | PHP_SUBST(install_binary_targets) | ||||
| Context not available. | |||||
| -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) | -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) | ||||
| +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) | +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) | ||||
| PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | ||||
| Context not available. | |||||