<p>Friendly Automation <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11355">View Change</a></p><div style="white-space:pre-wrap">Approvals:
mattf: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: Pass --fno-partial-inlining to third-party when appropriate<br><br>When the gcc version is >= 8.2.1, we were already setting the<br>--fno-partial-inlining flag for Asterisk source files to get around<br>a gcc bug but we weren't passing the flag down to the bundled<br>builds of pjproject and jansson.<br><br>ASTERISK-28392<br><br>Change-Id: I99ede9bc35408ecd096f7d5369e8192d3dc75704<br>---<br>M third-party/jansson/Makefile<br>M third-party/pjproject/Makefile<br>2 files changed, 16 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile</span><br><span>index a81502c..8c9da1a 100644</span><br><span>--- a/third-party/jansson/Makefile</span><br><span>+++ b/third-party/jansson/Makefile</span><br><span>@@ -49,6 +49,11 @@</span><br><span> include ../Makefile.rules</span><br><span> include Makefile.rules</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OPTIMIZE_CFLAGS = -g3</span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)</span><br><span style="color: hsl(120, 100%, 40%);">+ OPTIMIZE_CFLAGS += $(OPTIMIZE)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '</span><br><span> SHELL_ECHO_PREFIX := echo '[jansson] '</span><br><span> </span><br><span>@@ -82,7 +87,7 @@</span><br><span> source/config.status: source/.unpacked Makefile.rules .rebuild_needed</span><br><span> $(ECHO_PREFIX) Configuring</span><br><span> $(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared \</span><br><span style="color: hsl(0, 100%, 40%);">- --enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib)</span><br><span style="color: hsl(120, 100%, 40%);">+ --enable-static --prefix=$(JANSSON_DIR)/dest --libdir=$(JANSSON_DIR)/dest/lib CFLAGS="$(OPTIMIZE_CFLAGS)")</span><br><span> </span><br><span> configure: source/config.status</span><br><span> </span><br><span>diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile</span><br><span>index 97835e4..af0e9f8 100644</span><br><span>--- a/third-party/pjproject/Makefile</span><br><span>+++ b/third-party/pjproject/Makefile</span><br><span>@@ -45,6 +45,9 @@</span><br><span> else</span><br><span> $(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+ include ../../Makefile.rules</span><br><span style="color: hsl(120, 100%, 40%);">+ include ../Makefile.rules</span><br><span style="color: hsl(120, 100%, 40%);">+ include Makefile.rules</span><br><span> </span><br><span> all: _all</span><br><span> install: _install</span><br><span>@@ -64,20 +67,19 @@</span><br><span> endif</span><br><span> MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a</span><br><span> MALLOC_DEBUG_LDFLAGS = -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive</span><br><span style="color: hsl(0, 100%, 40%);">- ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)</span><br><span style="color: hsl(0, 100%, 40%);">- CF += -O3</span><br><span style="color: hsl(0, 100%, 40%);">- endif</span><br><span style="color: hsl(0, 100%, 40%);">- export CFLAGS += $(CF) -g3</span><br><span style="color: hsl(0, 100%, 40%);">- export LDFLAGS += $(CC_LDFLAGS)</span><br><span> TARGETS += pjproject.symbols</span><br><span> else</span><br><span> all install:</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+else</span><br><span style="color: hsl(120, 100%, 40%);">+ include ../../Makefile.rules</span><br><span style="color: hsl(120, 100%, 40%);">+ include ../Makefile.rules</span><br><span style="color: hsl(120, 100%, 40%);">+ include Makefile.rules</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-include ../../Makefile.rules</span><br><span style="color: hsl(0, 100%, 40%);">-include ../Makefile.rules</span><br><span style="color: hsl(0, 100%, 40%);">-include Makefile.rules</span><br><span style="color: hsl(120, 100%, 40%);">+export PJ_CFLAGS := $(filter-out -O% -g%,$(PJ_CFLAGS))</span><br><span style="color: hsl(120, 100%, 40%);">+export CFLAGS += $(CF)</span><br><span style="color: hsl(120, 100%, 40%);">+export LDFLAGS += $(CC_LDFLAGS)</span><br><span> </span><br><span> ECHO_PREFIX := $(ECHO_PREFIX) echo '[pjproject] '</span><br><span> SHELL_ECHO_PREFIX := echo '[pjproject] '</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11355">change 11355</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/11355"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I99ede9bc35408ecd096f7d5369e8192d3dc75704 </div>
<div style="display:none"> Gerrit-Change-Number: 11355 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: mattf <creslin@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>