diff options
Diffstat (limited to 'lang/php74/files/patch-configure.in')
-rw-r--r-- | lang/php74/files/patch-configure.in | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/lang/php74/files/patch-configure.in b/lang/php74/files/patch-configure.in new file mode 100644 index 000000000000..539cfd1d4997 --- /dev/null +++ b/lang/php74/files/patch-configure.in @@ -0,0 +1,61 @@ +--- configure.ac.orig 2018-01-02 22:35:55 UTC ++++ configure.ac +@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ... + + #undef PTHREADS + ++#include <ext/php_config.h> + #endif /* PHP_CONFIG_H */ + ]) + +@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4) + dnl . + dnl ------------------------------------------------------------------------- + +-PTHREADS_CHECK + PHP_HELP_SEPARATOR([SAPI modules:]) + PHP_SHLIB_SUFFIX_NAMES + PHP_BUILD_PROGRAM +@@ -370,15 +370,9 @@ else + AC_MSG_RESULT([none]) + fi + +-dnl Exit early +-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(nanosleep, rt) + + dnl Check for getaddrinfo, should be a better way, but... + dnl Also check for working getaddrinfo +@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` + EXPANDED_DATADIR=$datadir + EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` + EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` +-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR ++INCLUDE_PATH=.:${prefix}/share/pear + + exec_prefix=$old_exec_prefix + libdir=$old_libdir +@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets) + PHP_SUBST(install_targets) + PHP_SUBST(install_binary_targets) + +-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ 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) + |