From 2f3142dc7f691b17dd44e0dbe665141252d8b595 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 24 Aug 2024 23:52:53 +0200 Subject: [PATCH 1/2] Autotools: Simplify adding tidy cflags --- ext/tidy/config.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index e179a31d60bfd..15e3612fbacfd 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -58,8 +58,10 @@ if test "$PHP_TIDY" != "no"; then 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]) + 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.]) From 17ad737df5245b1c2e1bbd15f7a4f4d9297d1a4c Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sun, 25 Aug 2024 02:53:25 +0200 Subject: [PATCH 2/2] [skip ci] Add note about -Wno-ignored-qualifiers --- ext/tidy/config.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index 15e3612fbacfd..164440fb5b2c7 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -57,7 +57,8 @@ 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 + 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],,