Merge branch 'PHP-7.4'

* PHP-7.4:
  add librt for opcache
This commit is contained in:
Remi Collet 2019-10-08 10:49:30 +02:00
commit 3dabce087c

View File

@ -212,6 +212,7 @@ int main() {
msg=yes],[msg=no],[msg=no])
AC_MSG_RESULT([$msg])
PHP_CHECK_FUNC_LIB(shm_open, rt)
AC_MSG_CHECKING(for mmap() using shm_open() shared memory support)
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <sys/types.h>
@ -278,8 +279,13 @@ int main() {
}
]])],[dnl
AC_DEFINE(HAVE_SHM_MMAP_POSIX, 1, [Define if you have POSIX mmap() SHM support])
msg=yes],[msg=no],[msg=no])
AC_MSG_RESULT([$msg])
AC_MSG_RESULT([yes])
PHP_CHECK_LIBRARY(rt, shm_unlink, [PHP_ADD_LIBRARY(rt,1,OPCACHE_SHARED_LIBADD)])
],[
AC_MSG_RESULT([no])
],[
AC_MSG_RESULT([no])
])
PHP_NEW_EXTENSION(opcache,
ZendAccelerator.c \
@ -326,4 +332,5 @@ int main() {
PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag)
fi
PHP_SUBST(OPCACHE_SHARED_LIBADD)
fi