diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-08-17 22:34:19 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-08-17 22:34:19 +0000 |
| commit | 524cb990a3b57ee856504d4bdfd80923405f7506 (patch) | |
| tree | 9148c3e162fb765f29a09cb69e13c60ba4a20c58 /configure.ac | |
| parent | 66fb08e26da2071dcce6cf13cb319cf9474664fa (diff) | |
configure: Undefine FORTIFY_SOURCE prior to defining it for patched gcc
Some distributions of Linux patch gcc to define FORTIFY_SOURCE when gcc is
executed with optimization. This "help" unfortunately results in re-definition
warnings when FORTIFY_SOURCE is later defined in Asterisk's build system. This
patch undefines FORTIFY_SOURCE prior to defining it to prevent this warning.
Review: https://reviewboard.asterisk.org/r/3912/
ASTERISK-24032 #close
Reported by: Kilburn
Tested by: Kilburn, wdoekes
patches:
1.8.diff uploaded by cloos (License 5956)
10.diff uploaded by cloos (License 5956)
11.diff uploaded by cloos (License 5956)
12.diff uploaded by cloos (License 5956)
13.diff uploaded by cloos (License 5956)
........
Merged revisions 421227 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 421228 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 421229 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421230 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c97bcabeb..aa3cfd4d3 100644 --- a/configure.ac +++ b/configure.ac @@ -1045,9 +1045,9 @@ fi AC_SUBST(AST_TRAMPOLINES) AC_MSG_CHECKING(for _FORTIFY_SOURCE support) -if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then +if $(${CC} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then AC_MSG_RESULT(yes) - AST_FORTIFY_SOURCE=-D_FORTIFY_SOURCE=2 + AST_FORTIFY_SOURCE="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" else AC_MSG_RESULT(no) AST_FORTIFY_SOURCE= |