ports/lang/php81/files/patch-configure.ac
Dima Panov c89b6f2799 lang/php8[12]: Fix build on aarch64 with ZTS
- Refresh patches

PR:		266175
Reported by:	thresh@nginx.com
Sponsored by:	Bounce Experts
2023-04-12 07:39:13 +02:00

45 lines
1.3 KiB
Text

--- configure.ac.orig 2023-03-14 19:50:20 UTC
+++ configure.ac
@@ -55,6 +55,7 @@ AH_BOTTOM([
#include <string.h>
+#include <ext/php_config.h>
#endif /* PHP_CONFIG_H */
])
@@ -273,7 +274,6 @@ sinclude(Zend/Zend.m4)
dnl ----------------------------------------------------------------------------
-PTHREADS_CHECK
PHP_HELP_SEPARATOR([SAPI modules:])
PHP_SHLIB_SUFFIX_NAMES
PHP_BUILD_PROGRAM
@@ -614,7 +614,7 @@ memmem \
AX_FUNC_WHICH_GETHOSTBYNAME_R
dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
-PHP_CHECK_FUNC_LIB(nanosleep, rt)
+PHP_CHECK_FUNC(nanosleep, rt)
dnl Haiku does not have network api in libc.
PHP_CHECK_FUNC_LIB(setsockopt, network)
@@ -1372,7 +1372,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
@@ -1591,7 +1591,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_INSTALL_HEADERS([Zend/Optimizer], [ \
zend_call_graph.h \
zend_cfg.h \