Skip to content

Autotools: Simplify adding tidy cflags #15577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2024
Merged

Autotools: Simplify adding tidy cflags #15577

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f3142d
Autotools: Simplify adding tidy cflags
petk Aug 24, 2024
17ad737
[skip ci] Add note about -Wno-ignored-qualifiers
petk Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ext/tidy/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.])
Expand Down