[Pkg-voip-commits] [asterisk] 01/01: Make sure CPPFLAGS get carried down to the build system

[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 30a428357d06cadc0d488d444848c4c3437e50b0
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Dec 11 13:50:17 2013 +0100

    Make sure CPPFLAGS get carried down to the build system
---
 debian/changelog                 |  1 +
 debian/patches/preserve_cppflags | 49 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6e9b6c..0d68ad8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ asterisk (1:11.6.0~dfsg-2) UNRELEASED; urgency=medium
   * Update Standards-Version to 3.9.5 (no changes).
   * Add Suggests on asterisk-vpb.
   * Build against libfreeradius-client (Closes: #721622).
+  * Make sure CPPFLAGS get carried down to the build system.
 
   [ Tzafrir Cohen ]
   * Restore SE Linux settings on directories created in init script
diff --git a/debian/patches/preserve_cppflags b/debian/patches/preserve_cppflags
new file mode 100644
index 0000000..3a3bf7e
--- /dev/null
+++ b/debian/patches/preserve_cppflags
@@ -0,0 +1,49 @@
+Index: asterisk/configure.ac
+===================================================================
+--- asterisk.orig/configure.ac	2013-12-11 13:40:47.915458039 +0100
++++ asterisk/configure.ac	2013-12-11 13:41:02.567365173 +0100
+@@ -22,7 +22,7 @@
+ AC_COPYRIGHT("Asterisk")
+ AC_REVISION($Revision: 388769 $)
+ 
+-# preserve any CFLAGS or LDFLAGS that may be set
++# preserve any CFLAGS, CPPFLAGS or LDFLAGS that may be set
+ # NOTE: This must be done before calling any macros that end up
+ # calling AC_PROG_CC or the like, since they will set a default
+ # set of CFLAGS ("-g -O2") if the user did not supply any, and
+@@ -30,8 +30,10 @@
+ # rest of the build system since we have other means of controlling
+ # debugging symbol generation and optimization.
+ CONFIG_CFLAGS="${CFLAGS}"
++CONFIG_CPPFLAGS="${CPPFLAGS}"
+ CONFIG_LDFLAGS="${LDFLAGS}"
+ AC_SUBST(CONFIG_CFLAGS)
++AC_SUBST(CONFIG_CPPFLAGS)
+ AC_SUBST(CONFIG_LDFLAGS)
+ 
+ # specify output header file
+Index: asterisk/makeopts.in
+===================================================================
+--- asterisk.orig/makeopts.in	2013-12-11 13:40:47.915458039 +0100
++++ asterisk/makeopts.in	2013-12-11 13:40:47.911458064 +0100
+@@ -58,6 +58,7 @@
+ PTHREAD_LIBS=@PTHREAD_LIBS@
+ 
+ CONFIG_CFLAGS=@CONFIG_CFLAGS@
++CONFIG_CPPFLAGS=@CONFIG_CPPFLAGS@
+ CONFIG_LDFLAGS=@CONFIG_LDFLAGS@
+ 
+ GNU_LD=@GNU_LD@
+Index: asterisk/Makefile.rules
+===================================================================
+--- asterisk.orig/Makefile.rules	2013-12-11 13:40:47.915458039 +0100
++++ asterisk/Makefile.rules	2013-12-11 13:40:47.911458064 +0100
+@@ -58,6 +58,8 @@
+     _ASTCFLAGS+=$(CONFIG_CFLAGS)
+ endif
+ 
++_ASTCFLAGS+=$(CONFIG_CPPFLAGS)
++
+ # shortcuts for common combinations of flags; these must be recursively expanded so that
+ # per-target settings will be applied
+ CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS) $(ASTCFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index f4203ce..a4007f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,3 +31,4 @@ astdb_mans
 hyphen
 reenable
 freeradius-client
+preserve_cppflags

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