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: Sync CS in opcache Capstone check (#15084)

Browse Source 
- Added Capstone check message in configure log
- PKG_CHECK_MODULES already errors out by default if Capstone is not
  found with a bit more informative message
- Autoconf syntax used
- HAVE_CAPSTONE help text synced and updated
This commit is contained in:
Peter Kokot
2024-07-24 19:55:01 +02:00
committed by GitHub
parent e3c1e3326c
commit da69755eca
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ext/opcache/config.m4
View File

@@ -18,9 +18,10 @@ PHP_ARG_ENABLE([opcache-jit],
[yes],
[no])
PHP_ARG_WITH([capstone],,
PHP_ARG_WITH([capstone],
[whether to support opcache JIT dissasembly through Capstone],
[AS_HELP_STRING([--with-capstone],
[support opcache JIT disassembly through capstone])],
[Support opcache JIT disassembly through Capstone])],
[no],
[no])
@@ -94,16 +95,13 @@ if test "$PHP_OPCACHE" != "no"; then
;;
esac
AS_IF([test x"$with_capstone" = "xyes"],[
PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[
AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available])
AS_VAR_IF([PHP_CAPSTONE], [yes],
[PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0], [
AC_DEFINE([HAVE_CAPSTONE], [1], [Define to 1 if Capstone is available.])
PHP_EVAL_LIBLINE([$CAPSTONE_LIBS], [OPCACHE_SHARED_LIBADD])
PHP_EVAL_INCLINE([$CAPSTONE_CFLAGS])
ZEND_JIT_SRC="$ZEND_JIT_SRC jit/ir/ir_disasm.c"
],[
AC_MSG_ERROR([capstone >= 3.0 required but not found])
])
])
])])
PHP_SUBST([IR_TARGET])
PHP_SUBST([DASM_FLAGS])

2
ext/opcache/config.w32
View File

@@ -41,7 +41,7 @@ if (PHP_OPCACHE != "no") {
if (CHECK_HEADER_ADD_INCLUDE("capstone\\capstone.h", "CFLAGS_OPCACHE", PHP_OPCACHE+ ";" + PHP_PHP_BUILD + "\\include") &&
CHECK_LIB("capstone.lib", "opcache", PHP_OPCACHE)) {
AC_DEFINE('HAVE_CAPSTONE', 1, 'capstone support enabled');
AC_DEFINE('HAVE_CAPSTONE', 1, 'Define to 1 if Capstone is available.');
ir_src += " ir_disasm.c";
}