mirror of
https://git.freebsd.org/ports.git
synced 2025-06-10 23:30:29 -04:00
8c60cffc90
script in pre-configure to regenerate configure scripts. Because this regenerates php_config.h.in, merge a patch for that file into the patch for configure.in. - Remove redundant --localstatedir=/var (added by bsd.port.mk).
61 lines
1.7 KiB
Text
61 lines
1.7 KiB
Text
--- configure.in.orig 2018-01-03 02:32:22 UTC
|
|
+++ configure.in
|
|
@@ -115,6 +115,7 @@ int zend_sprintf(char *buffer, const char *format, ...
|
|
#endif
|
|
|
|
#undef PTHREADS
|
|
+#include <ext/php_config.h>
|
|
])
|
|
|
|
PHP_MAJOR_VERSION=7
|
|
@@ -370,7 +371,6 @@ sinclude(TSRM/tsrm.m4)
|
|
dnl .
|
|
dnl -------------------------------------------------------------------------
|
|
|
|
-PTHREADS_CHECK
|
|
PHP_HELP_SEPARATOR([SAPI modules:])
|
|
PHP_SHLIB_SUFFIX_NAMES
|
|
PHP_BUILD_PROGRAM
|
|
@@ -401,15 +401,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.
|
|
@@ -701,7 +695,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
|
|
@@ -1252,7 +1246,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
|
|
@@ -1461,7 +1455,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)
|
|
|