This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch main in repository tor.

The following commit(s) were added to refs/heads/main by this push: new 1bb386a759 added check for compiler support of Wextra-semi new 863428d753 Merge branch 'tor-gitlab/mr/627' 1bb386a759 is described below

commit 1bb386a759a67c95d12fa1165332d1e1afbb5f1c Author: Andy andy@blockbreakers.org AuthorDate: Thu Oct 13 16:35:19 2022 -0600

added check for compiler support of Wextra-semi

update AX_CHECK_COMPILE_FLAG function call --- configure.ac | 3 ++- m4/ax_check_compile_flag.m4 | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac index 6ab7903010..74ea8050ed 100644 --- a/configure.ac +++ b/configure.ac @@ -2357,7 +2357,6 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then -Wexplicit-ownership-type -Wextern-initializer -Wextra - -Wextra-semi -Wextra-tokens -Wflexible-array-extensions -Wfloat-conversion @@ -2504,6 +2503,8 @@ if test "x$enable_gcc_warnings_advisory" != "xno"; then ], [ TOR_TRY_COMPILE_WITH_CFLAGS(warning_flag, [], [TOR_WARNING_FLAGS="$TOR_WARNING_FLAGS warning_flag" CFLAGS="$CFLAGS warning_flag"], true) ]) + + AX_CHECK_COMPILE_FLAG([-Wextra-semi], [CFLAGS="$CFLAGS -Wextra-semi"], [], [-Werror])

dnl We should re-enable this in some later version. Clang doesn't dnl mind, but it causes trouble with GCC. diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000000..95df39679e --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,51 @@ + # Copyright (c) 2008 Guido U. Draheim guidod@gmx.de + # Copyright (c) 2011 Maarten Bosmans mkbosmans@gmail.com + # + # This program is free software: you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by the + # Free Software Foundation, either version 3 of the License, or (at your + # option) any later version. + # + # This program is distributed in the hope that it will be useful, but + # WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + # Public License for more details. + # + # You should have received a copy of the GNU General Public License along + # with this program. If not, see https://www.gnu.org/licenses/. + # + # As a special exception, the respective Autoconf Macro's copyright owner + # gives unlimited permission to copy, distribute and modify the configure + # scripts that are the output of Autoconf when processing the Macro. You + # need not follow the terms of the GNU General Public License when using + # or distributing such scripts, even though portions of the text of the + # Macro appear in them. The GNU General Public License (GPL) does govern + # all other use of the material that constitutes the Autoconf Macro. + # + # This special exception to the GPL applies to versions of the Autoconf + # Macro released by the Autoconf Archive. When you make and distribute a + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + # Copying and distribution of this file, with or without modification, are + # permitted in any medium without royalty provided the copyright notice + # and this notice are preserved. This file is offered as-is, without any + # warranty. + + #serial 5 + #serial 6 + + AC_DEFUN([AX_CHECK_COMPILE_FLAG], + [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS