[vlc-devel] [PATCH 1/2] configure: refactor RDC_PROG_{CC, CXX}_FLAGS with AX_APPEND_COMPILE_FLAGS
Thomas Guillem
thomas at gllm.fr
Fri Aug 25 09:31:36 CEST 2017
Look good to me
On Thu, Aug 24, 2017, at 14:33, Shaleen Jain wrote:
> Some of the issues with the former marcos being they
> silently fail adding the flags on warnings whereas
> the latter doesn't and prints the warnings out to
> stdout, better safeguards and portability.
> ---
> configure.ac | 16 +++----
> m4/ax_append_compile_flags.m4 | 68 ++++++++++++++++++++++++++++
> m4/ax_append_flag.m4 | 72 +++++++++++++++++++++++++++++
> m4/ax_check_compile_flag.m4 | 75 +++++++++++++++++++++++++++++++
> m4/ax_require_defined.m4 | 38 ++++++++++++++++
> m4/flags.m4 | 102
> ------------------------------------------
> 6 files changed, 260 insertions(+), 111 deletions(-)
> create mode 100644 m4/ax_append_compile_flags.m4
> create mode 100644 m4/ax_append_flag.m4
> create mode 100644 m4/ax_check_compile_flag.m4
> create mode 100644 m4/ax_require_defined.m4
> delete mode 100644 m4/flags.m4
>
> diff --git a/configure.ac b/configure.ac
> index 8487fea895..9214908171 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -942,11 +942,11 @@ dnl
> dnl Compiler warnings
> dnl
>
> -RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith
> bad-function-cast write-strings missing-prototypes volatile-register-var
> error-implicit-function-declaration init-self logical-op format-security
> shadow=local])
> -RDC_PROG_CC_FLAGS([-pipe])
> -AC_LANG_PUSH([C++])
> -RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith
> volatile-register-var format-security])
> -AC_LANG_POP([C++])
> +AX_APPEND_COMPILE_FLAGS([-Wall -Wextra -Wsign-compare -Wundef
> -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security],
> [CFLAGS])
> +AX_APPEND_COMPILE_FLAGS([-Wall -Wextra -Wsign-compare -Wundef
> -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security],
> [CXXFLAGS])
> +
> +AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast -Wwrite-strings
> -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self
> -Wlogical-op -Wshadow=local], [CFLAGS])
> +AX_APPEND_COMPILE_FLAGS([-pipe], [CFLAGS])
>
> dnl
> dnl Debugging mode
> @@ -1044,10 +1044,8 @@ AS_IF([test "${enable_optimizations}" != "no"], [
> ])
>
> dnl Check for fast maths
> - RDC_PROG_CC_FFLAGS([no-math-errno unsafe-math-optimizations
> no-rounding-math no-signaling-nans cx-limited-range])
> - AC_LANG_PUSH(C++)
> - RDC_PROG_CXX_FFLAGS([no-math-errno unsafe-math-optimizations
> no-rounding-math no-signaling-nans cx-limited-range])
> - AC_LANG_POP
> + AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations
> -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CFLAGS])
> + AX_APPEND_COMPILE_FLAGS([-fno-math-errno -funsafe-math-optimizations
> -fno-rounding-math -fno-signaling-nans -fcx-limited-range], [CXXFLAGS])
>
> AH_BOTTOM([
> #if defined(_MSC_VER) && !defined(__clang__)
> diff --git a/m4/ax_append_compile_flags.m4
> b/m4/ax_append_compile_flags.m4
> new file mode 100644
> index 0000000000..56627670d0
> --- /dev/null
> +++ b/m4/ax_append_compile_flags.m4
> @@ -0,0 +1,68 @@
> +#
> ============================================================================
> +#
> https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
> +#
> ============================================================================
> +#
> +# SYNOPSIS
> +#
> +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE],
> [EXTRA-FLAGS], [INPUT])
> +#
> +# DESCRIPTION
> +#
> +# For every FLAG1, FLAG2 it is checked whether the compiler works with
> the
> +# flag. If it does, the flag is added FLAGS-VARIABLE
> +#
> +# If FLAGS-VARIABLE is not specified, the current language's flags
> (e.g.
> +# CFLAGS) is used. During the check the flag is always added to the
> +# current language's flags.
> +#
> +# If EXTRA-FLAGS is defined, it is added to the current language's
> default
> +# flags (e.g. CFLAGS) when the check is done. The check is thus made
> with
> +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used
> to
> +# force the compiler to issue an error when a bad flag is given.
> +#
> +# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
> +#
> +# NOTE: This macro depends on the AX_APPEND_FLAG and
> +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
> +# AX_APPEND_LINK_FLAGS.
> +#
> +# LICENSE
> +#
> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans at 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.
> +
> +#serial 6
> +
> +AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
> +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
> +AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
> +for flag in $1; do
> + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [],
> [$3], [$4])
> +done
> +])dnl AX_APPEND_COMPILE_FLAGS
> +
> diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4
> new file mode 100644
> index 0000000000..7d3f840b84
> --- /dev/null
> +++ b/m4/ax_append_flag.m4
> @@ -0,0 +1,72 @@
> +#
> ===========================================================================
> +# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
> +#
> ===========================================================================
> +#
> +# SYNOPSIS
> +#
> +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
> +#
> +# DESCRIPTION
> +#
> +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
> +# added in between.
> +#
> +# If FLAGS-VARIABLE is not specified, the current language's flags
> (e.g.
> +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already
> contains
> +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly
> +# FLAG.
> +#
> +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
> +#
> +# LICENSE
> +#
> +# Copyright (c) 2008 Guido U. Draheim <guidod at gmx.de>
> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans at 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.
> +
> +#serial 7
> +
> +AC_DEFUN([AX_APPEND_FLAG],
> +[dnl
> +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
> +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
> +AS_VAR_SET_IF(FLAGS,[
> + AS_CASE([" AS_VAR_GET(FLAGS) "],
> + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
> + [
> + AS_VAR_APPEND(FLAGS,[" $1"])
> + AC_RUN_LOG([: FLAGS="$FLAGS"])
> + ])
> + ],
> + [
> + AS_VAR_SET(FLAGS,[$1])
> + AC_RUN_LOG([: FLAGS="$FLAGS"])
> + ])
> +AS_VAR_POPDEF([FLAGS])dnl
> +])dnl AX_APPEND_FLAG
> +
> diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
> new file mode 100644
> index 0000000000..80c79114e9
> --- /dev/null
> +++ b/m4/ax_check_compile_flag.m4
> @@ -0,0 +1,75 @@
> +#
> ===========================================================================
> +#
> https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
> +#
> ===========================================================================
> +#
> +# SYNOPSIS
> +#
> +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE],
> [EXTRA-FLAGS], [INPUT])
> +#
> +# DESCRIPTION
> +#
> +# Check whether the given FLAG works with the current language's
> compiler
> +# or gives an error. (Warnings, however, are ignored)
> +#
> +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
> +# success/failure.
> +#
> +# If EXTRA-FLAGS is defined, it is added to the current language's
> default
> +# flags (e.g. CFLAGS) when the check is done. The check is thus made
> with
> +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used
> to
> +# force the compiler to issue an error when a bad flag is given.
> +#
> +# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
> +#
> +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
> +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
> +#
> +# LICENSE
> +#
> +# Copyright (c) 2008 Guido U. Draheim <guidod at gmx.de>
> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans at 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.
> +
> +#serial 5
> +
> +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
> +
> diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4
> new file mode 100644
> index 0000000000..c4e9859550
> --- /dev/null
> +++ b/m4/ax_require_defined.m4
> @@ -0,0 +1,38 @@
> +#
> ===========================================================================
> +#
> https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
> +#
> ===========================================================================
> +#
> +# SYNOPSIS
> +#
> +# AX_REQUIRE_DEFINED(MACRO)
> +#
> +# DESCRIPTION
> +#
> +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros
> have
> +# been defined and thus are available for use. This avoids random
> issues
> +# where a macro isn't expanded. Instead the configure script emits a
> +# non-fatal:
> +#
> +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
> +#
> +# It's like AC_REQUIRE except it doesn't expand the required macro.
> +#
> +# Here's an example:
> +#
> +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
> +#
> +# LICENSE
> +#
> +# Copyright (c) 2014 Mike Frysinger <vapier at gentoo.org>
> +#
> +# 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 2
> +
> +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
> + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file
> missing?])])
> +])dnl AX_REQUIRE_DEFINED
> +
> diff --git a/m4/flags.m4 b/m4/flags.m4
> deleted file mode 100644
> index 0907f3b076..0000000000
> --- a/m4/flags.m4
> +++ /dev/null
> @@ -1,102 +0,0 @@
> -# Copyright © 2006 Rémi Denis-Courmont
> -# This file (flags.m4) is free software; unlimited permission to
> -# copy and/or distribute it , with or without modifications, as long
> -# as this notice is preserved.
> -
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
> -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
> -# PARTICULAR PURPOSE.
> -
> -AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
> -[AC_LANG_ASSERT(C)
> - CFLAGS_save="${CFLAGS}"
> - as_ac_var=`echo "ac_cv_prog_cc_flags_$1" | $as_tr_sh`
> - AC_CACHE_CHECK([if $CC accepts $1], [$as_ac_var], [
> - CFLAGS="${CFLAGS} -Werror $1"
> - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
> - eval "$as_ac_var=yes"
> - ],[
> - eval "$as_ac_var=no"
> - ])
> - ])
> -
> - ac_res=`eval echo '${'$as_ac_var'}'`
> - CFLAGS="${CFLAGS_save}"
> - AS_IF([test "${ac_res}" != "no"], [$2], [$3])
> -])
> -
> -AC_DEFUN([RDC_PROG_CC_FLAGS],
> -[AC_LANG_ASSERT(C)
> - RDC_PROG_CC_FLAGS_IFELSE([$1], [CFLAGS="${CFLAGS} $1"])
> -])
> -
> -AC_DEFUN([RDC_PROG_CC_WFLAGS],
> -[ for a in $1; do
> - RDC_PROG_CC_FLAGS([-W$a])
> - done
> -])
> -
> -AC_DEFUN([RDC_PROG_CC_FFLAGS],
> -[ for a in $1; do
> - RDC_PROG_CC_FLAGS([-f$a])
> - done
> -])
> -
> -AC_DEFUN([RDC_PROG_CXX_FLAGS_IFELSE],
> -[AC_LANG_ASSERT(C++)
> - CXXFLAGS_save="${CXXFLAGS}"
> - as_ac_var=`echo "ac_cv_prog_cxx_flags_$1" | $as_tr_sh`
> - AC_CACHE_CHECK([if $CXX accepts $1], [$as_ac_var], [
> - CXXFLAGS="${CXXFLAGS} -Werror $1"
> - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
> - eval "$as_ac_var=yes"
> - ],[
> - eval "$as_ac_var=no"
> - ])
> - ])
> -
> - ac_res=`eval echo '${'$as_ac_var'}'`
> - CXXFLAGS="${CXXFLAGS_save}"
> - AS_IF([test "${ac_res}" != "no"], [$2], [$3])
> -])
> -
> -AC_DEFUN([RDC_PROG_CXX_FLAGS],
> -[AC_LANG_ASSERT(C++)
> - RDC_PROG_CXX_FLAGS_IFELSE([$1], [CXXFLAGS="${CXXFLAGS} $1"])
> -])
> -
> -AC_DEFUN([RDC_PROG_CXX_WFLAGS],
> -[ for a in $1; do
> - RDC_PROG_CXX_FLAGS([-W$a])
> - done
> -])
> -
> -AC_DEFUN([RDC_PROG_CXX_FFLAGS],
> -[ for a in $1; do
> - RDC_PROG_CXX_FLAGS([-f$a])
> - done
> -])
> -
> -AC_DEFUN([RDC_PROG_LINK_FLAGS_IFELSE],
> -[AC_LANG_ASSERT(C)
> - LDFLAGS_save="${LDFLAGS}"
> - as_ac_var=`echo "ac_cv_prog_link_flags_$1" | $as_tr_sh`
> - AC_CACHE_CHECK([if $LINK accepts $1], [$as_ac_var], [
> - LDFLAGS="${LDFLAGS} $1"
> - AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
> - eval "$as_ac_var=yes"
> - ],[
> - eval "$as_ac_var=no"
> - ])
> - ])
> -
> - ac_res=`eval echo '${'$as_ac_var'}'`
> - AS_IF([test "${ac_res}" != "no"], [
> - LDFLAGS="${LDFLAGS} $1"
> - $2
> - ], [
> - LDFLAGS="${LDFLAGS_save}"
> - $3
> - ])
> -])
> --
> 2.14.1
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
More information about the vlc-devel
mailing list