diff options
| author | Michael Heimpold <mhei@heimpold.de> | 2018-02-14 14:46:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-03-23 22:02:17 +0100 |
| commit | 25ba60b1479eb332a7388732f3ee5467000fbe73 (patch) | |
| tree | 4165081af39e479de22d2e7e64b75f3174861c9d | |
| parent | 7f4327bc244263818bb12d4dc87f8a454e0392f2 (diff) | |
| download | php-git-25ba60b1479eb332a7388732f3ee5467000fbe73.tar.gz | |
Fixed bug #75722: Rework valgrind detection
As described in bug report #75722, the configure script (acinclude.m4)
currently searches for the valgrind header file and enables valgrind
support if found.
When cross-compiling the searched paths are invalid for the target
platform because they belong to the host system. At the moment, there is
no way to tell the build system a dedicated path where to look for the
header file.
This leads to the issue, that when cross-compiling eg. for ARMv5 platform,
that valgrind header file is detected - e.g. because host system is amd64 -
and support is enabled - but target platform will never support valgrind
(valgrind requires e.g. at least ARMv7).
This change reworks the detection so that user could manually opt-in
valgrind support and optionally specify a directory where the build system
should look for the header file using the --with-valgrind option.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | acinclude.m4 | 20 | ||||
| -rw-r--r-- | configure.ac | 30 |
3 files changed, 33 insertions, 21 deletions
@@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2018, PHP 7.2.5 +- Core: + . Fixed bug #75722 (Convert valgrind detection to configure option). + (Michael Heimpold) + - Mbstring: . Fixed bug #75944 (Wrong cp1251 detection). (dmk001) . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1). diff --git a/acinclude.m4 b/acinclude.m4 index d42d708535..eb06cb7e36 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3249,23 +3249,3 @@ AC_DEFUN([PHP_CHECK_BUILTIN_SSUBLL_OVERFLOW], [ dnl Load the AX_CHECK_COMPILE_FLAG macro from the autoconf archive. m4_include([build/ax_check_compile_flag.m4]) - -dnl PHP_CHECK_VALGRIND -AC_DEFUN([PHP_CHECK_VALGRIND], [ - AC_MSG_CHECKING([for valgrind]) - - SEARCH_PATH="/usr/local /usr" - SEARCH_FOR="/include/valgrind/valgrind.h" - for i in $SEARCH_PATH ; do - if test -r $i/$SEARCH_FOR; then - VALGRIND_DIR=$i - fi - done - - if test -z "$VALGRIND_DIR"; then - AC_MSG_RESULT([not found]) - else - AC_MSG_RESULT(found in $VALGRIND_DIR) - AC_DEFINE(HAVE_VALGRIND, 1, [ ]) - fi -]) diff --git a/configure.ac b/configure.ac index 05f94f08a9..c5d9be978b 100644 --- a/configure.ac +++ b/configure.ac @@ -753,7 +753,35 @@ if test "x$php_crypt_r" = "x1"; then PHP_CRYPT_R_STYLE fi -PHP_CHECK_VALGRIND +dnl Check valgrind support +PHP_ARG_WITH(valgrind, [whether to enable valgrind support], +[ --with-valgrind=DIR Enable valgrind support], yes, no) + +if test "$PHP_VALGRIND" != "no"; then + + AC_MSG_CHECKING([for valgrind header]) + + if test "$PHP_VALGRIND" = "yes"; then + SEARCH_PATH="/usr/local /usr" + else + SEARCH_PATH="$PHP_VALGRIND" + fi + + SEARCH_FOR="/include/valgrind/valgrind.h" + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + VALGRIND_DIR=$i + fi + done + + if test -z "$VALGRIND_DIR"; then + AC_MSG_RESULT([not found]) + else + AC_MSG_RESULT(found in $VALGRIND_DIR) + AC_DEFINE(HAVE_VALGRIND, 1, [ ]) + fi + +fi dnl General settings. dnl ------------------------------------------------------------------------- |