From f88e32d4b5797024954258c0caa5058f5b929159 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 25 Aug 2024 17:25:54 +0200 Subject: [PATCH] Autotools: Simplify adding tidy cflags (#15577) --- ext/tidy/config.m4 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index e179a31d60b..164440fb5b2 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -57,9 +57,12 @@ if test "$PHP_TIDY" != "no"; then [TIDY_SHARED_LIBADD]) PHP_ADD_INCLUDE([$TIDY_INCDIR]) - dnl Add -Wno-ignored-qualifiers as this is an issue upstream - TIDY_COMPILER_FLAGS="$TIDY_CFLAGS -Wno-ignored-qualifiers -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1" - PHP_NEW_EXTENSION([tidy], [tidy.c], [$ext_shared],, [$TIDY_COMPILER_FLAGS]) + dnl Add -Wno-ignored-qualifiers as this is an issue upstream. Fixed in + dnl tidy-html5 5.7.20: https://github.com/htacg/tidy-html5/issues/866 + PHP_NEW_EXTENSION([tidy], + [tidy.c], + [$ext_shared],, + [-Wno-ignored-qualifiers -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1]) PHP_SUBST([TIDY_SHARED_LIBADD]) AC_DEFINE([HAVE_TIDY], [1], [Define to 1 if the PHP extension 'tidy' is available.])