php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Refactor mach_vm_read check in FPM (#14830)

Browse Source 
- Check wrapped in AC_CACHE_CHECK
- Synced CS
This commit is contained in:
Peter Kokot
2024-07-05 15:19:14 +02:00
committed by GitHub
parent d7ddf83dde
commit 83cd1c241e
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sapi/fpm/config.m4
View File

@@ -145,26 +145,25 @@ AC_DEFUN([PHP_FPM_TRACE],
AC_DEFINE([HAVE_PTRACE], 1, [do we have ptrace?])
fi
have_mach_vm_read=no
AS_VAR_IF([have_broken_ptrace], [yes],
[AC_CACHE_CHECK([for mach_vm_read], [php_cv_have_mach_vm_read],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <mach/mach.h>
#include <mach/mach_vm.h>
], [
mach_vm_read(
(vm_map_t)0,
(mach_vm_address_t)0,
(mach_vm_size_t)0,
(vm_offset_t *)0,
(mach_msg_type_number_t*)0);
])],
[php_cv_have_mach_vm_read=yes],
[php_cv_have_mach_vm_read=no])])
])
if test "$have_broken_ptrace" = "yes"; then
AC_MSG_CHECKING([for mach_vm_read])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <mach/mach.h>
#include <mach/mach_vm.h>
]], [[
mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
]])], [
have_mach_vm_read=yes
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
fi
if test "$have_mach_vm_read" = "yes"; then
AC_DEFINE([HAVE_MACH_VM_READ], 1, [do we have mach_vm_read?])
fi
AS_VAR_IF([php_cv_have_mach_vm_read], [yes],
[AC_DEFINE([HAVE_MACH_VM_READ], [1],
[Define to 1 if you have the 'mach_vm_read'.])])
proc_mem_file=""
@@ -229,7 +228,7 @@ AC_DEFUN([PHP_FPM_TRACE],
elif test -n "$proc_mem_file"; then
fpm_trace_type=pread
elif test "$have_mach_vm_read" = "yes" ; then
elif test "$php_cv_have_mach_vm_read" = "yes" ; then
fpm_trace_type=mach
else