mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Autotools: Refactor phpdbg POSIX Threads checks (#14865)
- AS_VAR_IF, AS_VAR_APPEND used and CS synced - Added one missing AC_MSG_RESULT to properly put the configure output log on each line - AH_TEMPLATE used for HAVE_USERFAULTFD_WRITEFAULT to have help text on lesser places - Redundant terminating semicolons removed - Redundant PTHREADS_CHECK call removed as it is already done in configure.ac and before including SAPI M4 stubs - Redundant CFLAGS and LIBS storing and restoring removed
This commit is contained in:
@@ -42,29 +42,26 @@ if test "$PHP_PHPDBG" != "no"; then
|
||||
AC_MSG_RESULT([disabled])
|
||||
fi
|
||||
|
||||
AC_CHECK_DECL([UFFDIO_WRITEPROTECT_MODE_WP], [
|
||||
if test "$enable_zts" != "yes"; then
|
||||
CFLAGS_SAVE="$CFLAGS"
|
||||
LIBS_SAVE="$LIBS"
|
||||
AH_TEMPLATE([HAVE_USERFAULTFD_WRITEFAULT],
|
||||
[Define to 1 if faulting on write-protected memory support can be compiled
|
||||
for userfaultfd.])
|
||||
|
||||
PTHREADS_CHECK
|
||||
AC_MSG_CHECKING([working pthreads]);
|
||||
|
||||
if test "$pthreads_working" = "yes"; then
|
||||
AC_MSG_RESULT([$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib]);
|
||||
PHP_PHPDBG_CFLAGS="$PHP_PHPDBG_CFLAGS $ac_cv_pthreads_cflags"
|
||||
PHPDBG_EXTRA_LIBS="$PHPDBG_EXTRA_LIBS -l$ac_cv_pthreads_lib"
|
||||
AC_DEFINE(HAVE_USERFAULTFD_WRITEFAULT, 1, [Whether faulting on write-protected memory support can be compiled for userfaultfd])
|
||||
else
|
||||
AC_MSG_WARN([pthreads not available])
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS_SAVE"
|
||||
LIBS="$LIBS_SAVE"
|
||||
else
|
||||
AC_DEFINE(HAVE_USERFAULTFD_WRITEFAULT, 1, [Whether faulting on write-protected memory support can be compiled for userfaultfd])
|
||||
fi
|
||||
],,[#include <linux/userfaultfd.h>])
|
||||
AC_CHECK_DECL([UFFDIO_WRITEPROTECT_MODE_WP],
|
||||
[AS_VAR_IF([enable_zts], [yes],
|
||||
[AC_DEFINE([HAVE_USERFAULTFD_WRITEFAULT], [1])],
|
||||
[AC_MSG_CHECKING([working pthreads])
|
||||
AS_VAR_IF([pthreads_working], [yes], [
|
||||
AC_MSG_RESULT([$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib])
|
||||
AS_VAR_APPEND([PHP_PHPDBG_CFLAGS], [" $ac_cv_pthreads_cflags"])
|
||||
AS_VAR_APPEND([PHPDBG_EXTRA_LIBS], [" -l$ac_cv_pthreads_lib"])
|
||||
AC_DEFINE([HAVE_USERFAULTFD_WRITEFAULT], [1])
|
||||
], [
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_WARN([pthreads not available])
|
||||
])
|
||||
])
|
||||
],,
|
||||
[#include <linux/userfaultfd.h>])
|
||||
|
||||
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/phpdbg/Makefile.frag],
|
||||
[$abs_srcdir/sapi/phpdbg],
|
||||
|
||||
Reference in New Issue
Block a user