From 1b1882c4c149a3263eeea40c1073516cde1a6e19 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 25 Mar 2020 19:13:59 +0100 Subject: [PATCH 1/3] Add -Wno-ignored-qualifiers compiler flag to Tidy extension. This is an issue in the provided library and needs to be fixed upstream. --- ext/tidy/config.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index dab58787d46bb..56f1bb3009be8 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -65,8 +65,9 @@ if test "$PHP_TIDY" != "no"; then PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD) PHP_ADD_INCLUDE($TIDY_INCDIR) - - PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + dnl Add -Wno-empty-body 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_SUBST(TIDY_SHARED_LIBADD) AC_DEFINE(HAVE_TIDY,1,[ ]) fi From 43e2baf1f2f9c5acc85340c35fc25a190973e70a Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Thu, 26 Mar 2020 21:17:23 +0100 Subject: [PATCH 2/3] Add -Wno-type-limits compiler flag to Sodium extension This may happen on 32bits --- ext/sodium/config.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4 index 906e0ca7f225a..0676b66910680 100644 --- a/ext/sodium/config.m4 +++ b/ext/sodium/config.m4 @@ -11,6 +11,8 @@ if test "$PHP_SODIUM" != "no"; then AC_DEFINE(HAVE_LIBSODIUMLIB, 1, [ ]) - PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared) + dnl Add -Wno-type-limits as this may arise on 32bits platforms + SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits" + PHP_NEW_EXTENSION(sodium, libsodium.c sodium_pwhash.c, $ext_shared, , $SODIUM_COMPILER_FLAGS) PHP_SUBST(SODIUM_SHARED_LIBADD) fi From 8d3d741f31c9a9ab335410ebbe043d071f5134e2 Mon Sep 17 00:00:00 2001 From: George Peter Banyard Date: Wed, 5 Feb 2020 17:36:41 +0100 Subject: [PATCH 3/3] Add -Wextra compiler warnings and exclude the trigger happy ones The compile warnings which are explicitly suppressed are: * -Wno-implicit-fallthrough * -Wno-unused-parameter * -Wno-sign-compare * -Wno-clobbered, only with GCC --- Zend/Zend.m4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index fc4634580ecee..7c715e853bf5b 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -221,7 +221,10 @@ else AC_DEFINE(ZEND_DEBUG,0,[ ]) fi -test -n "$GCC" && CFLAGS="$CFLAGS -Wall -Wno-strict-aliasing" +test -n "$GCC" && CFLAGS="$CFLAGS -Wall -Wextra -Wno-strict-aliasing -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-sign-compare" +dnl Check if compiler supports -Wno-clobbered (only GCC) +AX_CHECK_COMPILE_FLAG([-Wno-clobbered], CFLAGS="$CFLAGS -Wno-clobbered", , [-Werror]) + test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" if test "$ZEND_ZTS" = "yes"; then