[svn-commits] gtjoseph: branch 1.8 r417016 - in /branches/1.8: Makefile Makefile.rules

[SVN commits to the Digium repositories]

Author: gtjoseph
Date: Sun Jun 22 15:46:38 2014
New Revision: 417016

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=417016
Log:
build:  Turn FORTIFY_SOURCE off if DONT_OPTIMIZE is set.

AST_FORTIFY_SOURCE is automatically set in ./Makefile even if DONT_OPTIMIZE
is set in menuselect.  This causes gcc to complain that _FORTIFY_SOURCE
requires optimization and the build will fail.  You can specify
"make AST_FORTIFY_SOURCE=''" but I always forget.

This patch moves the set of AST_FORTIFY_SOURCE to Makefile.rules and only
sets it if DONT_OPTIMIZE is "no".  The move is necessary because the
top-level Makefile doesn't include menuselect.makeopts.

This doesn't solve the entire problem however because res_config_mysql
seems to force _FORTIFY_SOURCE so res_config_mysql has to be disabled
for now if DONT_OPTIMIZE is set.

Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3664/

Modified:
    branches/1.8/Makefile
    branches/1.8/Makefile.rules

Modified: branches/1.8/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/Makefile?view=diff&rev=417016&r1=417015&r2=417016
==============================================================================
--- branches/1.8/Makefile (original)
+++ branches/1.8/Makefile Sun Jun 22 15:46:38 2014
@@ -176,7 +176,6 @@
   _ASTCFLAGS+=-Werror
   _ASTCFLAGS+=-Wunused
   _ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
-  _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
   _ASTCFLAGS+=-Wundef 
   _ASTCFLAGS+=-Wmissing-format-attribute
   _ASTCFLAGS+=-Wformat=2

Modified: branches/1.8/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/Makefile.rules?view=diff&rev=417016&r1=417015&r2=417016
==============================================================================
--- branches/1.8/Makefile.rules (original)
+++ branches/1.8/Makefile.rules Sun Jun 22 15:46:38 2014
@@ -82,6 +82,8 @@
 # and if that doesn't fail then compile again with optimizer disabled
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_DEVMODE),DONT_OPTIMIZEyes)
 COMPILE_DOUBLE=yes
+else
+_ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
 endif
 
 ifeq ($(findstring BUILD_NATIVE,$(MENUSELECT_CFLAGS)),BUILD_NATIVE)