From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 13 Jul 2018 23:26:46 +0000 (-0500)
Subject: Build: Fix modules getting their optimization setting overridden.
X-Git-Tag: 15.6.0-rc1~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1635adf8ec495005b363ed703b83971874a4204;p=thirdparty%2Fasterisk.git

Build: Fix modules getting their optimization setting overridden.

Asterisk modules that use PJPROJECT services have their compiler
optimization and possibly their symbolic debug options overridden by the
PJPROJECT configure script selected settings.

* We need to filter-out any -O and -g options in PJ_CFLAGS before echoing
out the result so the PJPROJECT_INCLUDE variable does not override the
Asterisk module settings when using bundled PJPROJECT.

NOTE: This patch only has an effect when using bundled PJPROJECT.

ASTERISK-27563

Change-Id: If124169735ecf572ad1535cd43bff94cb44d5b30
---

diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 6ebd685b25..dbd2a88646 100644
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -155,8 +155,11 @@ build.mak: source/build.mak
 
 configure: source/build.mak
 
+# We need to filter-out any -O and -g options in PJ_CFLAGS before echoing out
+# the result so Asterisk modules don't have the optimization and symbolic debug
+# options overridden by the PJPROJECT configure script selected settings.
 echo_cflags: source/build.mak
-	@echo $(PJ_CFLAGS)
+	@echo $(filter-out -O% -g%,$(PJ_CFLAGS))
 
 libpj%.a: source/build.mak
 	$(ECHO_PREFIX) Compiling lib $(@F)