[Pkg-voip-commits] [asterisk] 01/01: clear AST_FORTIFY_SOURCE instead of patching source

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 6e2b449138b48b3193bc6287250e4cccc312562c
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Sep 26 12:09:18 2014 +0200

    clear AST_FORTIFY_SOURCE instead of patching source
---
 debian/patches/buildflags.patch | 18 ------------------
 debian/patches/series           |  1 -
 debian/rules                    |  2 +-
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/patches/buildflags.patch b/debian/patches/buildflags.patch
deleted file mode 100644
index 00fda03..0000000
--- a/debian/patches/buildflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Jeremy Lainé <jeremy.laine at m4x.org>
-
-Disable asterisk's fortify source options, this is already handled
-by Debian's build flags.
-
-diff --git a/Makefile.rules b/Makefile.rules
-index d035f97..fb63634 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -82,8 +82,6 @@ CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
- # 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)
diff --git a/debian/patches/series b/debian/patches/series
index ceeb089..286b680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,5 +32,4 @@ smsq_enable.patch
 escape_manpage_hyphen.patch
 aelparse_enable.patch
 res_fax_bounds.patch
-buildflags.patch
 neon_version_check.patch
diff --git a/debian/rules b/debian/rules
index ea588ec..0c20a90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ BUILD_OS=$(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
 export PROC := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 
 # don't let asterisk mess with build flags
-BUILDFLAGS += MAKECMDGOALS=dont-optimize DEBUG= OPTIMIZE=
+BUILDFLAGS += AST_FORTIFY_SOURCE= DEBUG= OPTIMIZE=
 
 # show full gcc arguments instead of [CC] and [LD]
 BUILDFLAGS += NOISY_BUILD=yes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git