Browse Source

php7: disable valgrind support

The check to enable/disable this new feature of PHP 7.2 works
incorrectly when cross-compiling because it detects the host headers
only and there is no way to pass in a dedicated directory.

The wish to change this was reported upstream at:
https://bugs.php.net/bug.php?id=75722

For the meantime, use a self-cooked patch.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
lilik-openwrt-22.03
Michael Heimpold 7 years ago
parent
commit
97305e41b6
2 changed files with 43 additions and 0 deletions
  1. +1
    -0
      lang/php7/Makefile
  2. +42
    -0
      lang/php7/patches/1008-acinclude-valgrind.patch

+ 1
- 0
lang/php7/Makefile View File

@ -469,6 +469,7 @@ CONFIGURE_VARS+= \
iconv_impl_name="gnu_libiconv" \
ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \
ac_cv_u8t_decompose=yes \
ac_cv_enable_valgrind_check=no \
define Package/php7/conffiles
/etc/php.ini


+ 42
- 0
lang/php7/patches/1008-acinclude-valgrind.patch View File

@ -0,0 +1,42 @@
--- a/acinclude.m4 2017-11-28 10:22:53.000000000 +0100
+++ b/acinclude.m4 2017-12-22 16:28:09.361331754 +0100
@@ -3227,20 +3227,26 @@
dnl PHP_CHECK_VALGRIND
AC_DEFUN([PHP_CHECK_VALGRIND], [
- AC_MSG_CHECKING([for valgrind])
+ AC_CACHE_CHECK(whether to enable the check for valgrind support,ac_cv_enable_valgrind_check,[
+ ac_cv_enable_valgrind_check=yes
+ ])
- 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 "$ac_cv_enable_valgrind_check" = "yes"; then
+ 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, [ ])
+ 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
])

Loading…
Cancel
Save