[asterisk-dev] [Code Review] 3912: Fix ASTERISK-24032.

wdoekes reviewboard at asterisk.org
Fri Aug 15 02:46:23 CDT 2014


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/3912/#review13088
-----------------------------------------------------------

Ship it!


Works for me.

The configure changes are:

--- configure.orig	2014-08-15 09:38:56.678244200 +0200
+++ configure	2014-08-15 09:41:39.542612601 +0200
@@ -16733,10 +16733,10 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FORTIFY_SOURCE support" >&5
 $as_echo_n "checking for _FORTIFY_SOURCE support... " >&6; }
-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
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	AST_FORTIFY_SOURCE=-D_FORTIFY_SOURCE=2
+       AST_FORTIFY_SOURCE="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }


- wdoekes


On Aug. 14, 2014, 10:04 p.m., cloos wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/3912/
> -----------------------------------------------------------
> 
> (Updated Aug. 14, 2014, 10:04 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Bugs: ASTERISK-24032
>     https://issues.asterisk.org/jira/browse/ASTERISK-24032
> 
> 
> Repository: Asterisk
> 
> 
> Description
> -------
> 
> Fix for ASTERISK-24032.
> 
> The jira also has patches for each of the 1.8 .. 13 branches.
> 
> To deal with instances of gcc which are patched to define _FORTIFY_SOURCE internally, the convention is to use -U_FORTIFY_SOURCE before -D_FORTIFY_SOURCE, to avoid the redefined warnings.
> 
> So this is essentially:
> 
>    s/-D_FORTIFY_SOURCE/-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE/g
> 
> in configure.ac.
> 
> The patch does not include regenerating configure, in case of autoconf version differences.
> 
> 
> Diffs
> -----
> 
>   trunk/configure.ac 420991 
> 
> Diff: https://reviewboard.asterisk.org/r/3912/diff/
> 
> 
> Testing
> -------
> 
> ./bootstrap.sh; ./configure; make
> 
> No warnings were generated.
> 
> 
> Thanks,
> 
> cloos
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20140815/d2f97099/attachment-0001.html>


More information about the asterisk-dev mailing list