Test whether -D_FORTIFY_SOURCE needs to be added at all

Some distributions unconditionally enable -D_FORTIFY_SOURCE, and
adding it to CFLAGS might cause a slew of warnings:

  <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
  <built-in>: note: this is the location of the previous definition

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
This commit is contained in:
David Seifert 2017-01-27 23:51:19 +01:00 committed by Erik de Castro Lopo
parent 1bfb5a908f
commit 88956f7ac2
2 changed files with 58 additions and 3 deletions

View File

@ -0,0 +1,53 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_ADD_FORTIFY_SOURCE
#
# DESCRIPTION
#
# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
# redefinition warnings. Some distributions (such as Gentoo Linux) enable
# _FORTIFY_SOURCE globally in their compilers, leading to unnecessary
# warnings in the form of
#
# <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
# <built-in>: note: this is the location of the previous definition
#
# which is a problem if -Werror is enabled. This macro checks whether
# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
# to CPPFLAGS.
#
# LICENSE
#
# Copyright (c) 2017 David Seifert <soap@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 1
AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
AC_LINK_IFELSE([
AC_LANG_SOURCE(
[[
int main() {
#ifndef _FORTIFY_SOURCE
return 0;
#else
this_is_an_error;
#endif
}
]]
)], [
AC_MSG_RESULT([yes])
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
], [
AC_MSG_RESULT([no])
])
])

View File

@ -507,9 +507,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
MN_ADD_CXXFLAGS([-Wpointer-arith])
AC_LANG_POP([C++])
MN_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
if test x$enable_stack_smash_protection = "xyes" ; then
XIPH_GCC_STACK_PROTECTOR
XIPH_GXX_STACK_PROTECTOR
@ -520,6 +517,11 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
MN_ADD_CFLAGS([-coverage])
fi
dnl some distributions (such as Gentoo) have _FORTIFY_SOURCE always
dnl enabled. We test for this situation in order to prevent polluting
dnl the console with messages of macro redefinitions.
AX_ADD_FORTIFY_SOURCE
common_flags="-Wcast-align -Wcast-qual -Wshadow -Wwrite-strings -Wundef -Wuninitialized -Winit-self"
# -Winline -Wconversion "