<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10656">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Chris Savinovich: Looks good to me, but someone else must approve
Benjamin Keith Ford: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjproject-bundled: Use AST_DEVMODE for conditional compilation.<br><br>We previously allowed resample and g711 codecs to be built when<br>TEST_FRAMEWORK was enabled. This could cause errors if the testsuite<br>was run without this option enabled. Switch the build system to allow<br>those codecs to be built when --enable-dev-mode is used. This removes a<br>chance for strange testsuite errors from use of an inadequate pjsua<br>binary.<br><br>Change-Id: Iee8a3613cdb711fa7e7d217c5a775a575907ae22<br>---<br>M configure<br>M third-party/pjproject/Makefile<br>M third-party/pjproject/Makefile.rules<br>M third-party/pjproject/configure.m4<br>4 files changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 6b71e19..faf0781 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -9403,7 +9403,7 @@</span><br><span> fi</span><br><span> </span><br><span> export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(0, 100%, 40%);">- export NOISY_BUILD</span><br><span style="color: hsl(120, 100%, 40%);">+ export NOISY_BUILD AST_DEVMODE</span><br><span> ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span> PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span> EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span>diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile</span><br><span>index c761cb5..97835e4 100644</span><br><span>--- a/third-party/pjproject/Makefile</span><br><span>+++ b/third-party/pjproject/Makefile</span><br><span>@@ -54,14 +54,12 @@</span><br><span> include source/build.mak</span><br><span> CF := $(filter-out -W%,$(CC_CFLAGS))</span><br><span> CF := $(filter-out -I%,$(CF))</span><br><span style="color: hsl(0, 100%, 40%);">- ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),TEST_FRAMEWORK)</span><br><span style="color: hsl(120, 100%, 40%);">+ ifeq ($(AST_DEVMODE),yes)</span><br><span> apps := source/pjsip-apps/bin/pjsua-$(TARGET_NAME) source/pjsip-apps/bin/pjsystest-$(TARGET_NAME)</span><br><span> TARGETS += $(apps)</span><br><span> ifneq ($(PYTHONDEV_LIB),)</span><br><span> TARGETS += source/pjsip-apps/src/python/_pjsua.so</span><br><span> endif</span><br><span style="color: hsl(0, 100%, 40%);">- endif</span><br><span style="color: hsl(0, 100%, 40%);">- ifeq ($(AST_DEVMODE),yes)</span><br><span> CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes</span><br><span> endif</span><br><span> MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a</span><br><span>diff --git a/third-party/pjproject/Makefile.rules b/third-party/pjproject/Makefile.rules</span><br><span>index 6a48e86..e76a753 100644</span><br><span>--- a/third-party/pjproject/Makefile.rules</span><br><span>+++ b/third-party/pjproject/Makefile.rules</span><br><span>@@ -39,7 +39,7 @@</span><br><span> --without-external-pa \</span><br><span> --without-external-srtp</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),)</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(AST_DEVMODE),yes)</span><br><span> PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec</span><br><span> endif</span><br><span> </span><br><span>diff --git a/third-party/pjproject/configure.m4 b/third-party/pjproject/configure.m4</span><br><span>index 94be9b8..8541710 100644</span><br><span>--- a/third-party/pjproject/configure.m4</span><br><span>+++ b/third-party/pjproject/configure.m4</span><br><span>@@ -73,7 +73,7 @@</span><br><span> fi</span><br><span> </span><br><span> export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP</span><br><span style="color: hsl(0, 100%, 40%);">- export NOISY_BUILD</span><br><span style="color: hsl(120, 100%, 40%);">+ export NOISY_BUILD AST_DEVMODE</span><br><span> ${GNU_MAKE} --quiet --no-print-directory -C ${PJPROJECT_DIR} \</span><br><span> PJPROJECT_CONFIGURE_OPTS="$PJPROJECT_CONFIGURE_OPTS" \</span><br><span> EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10656">change 10656</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/10656"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iee8a3613cdb711fa7e7d217c5a775a575907ae22 </div>
<div style="display:none"> Gerrit-Change-Number: 10656 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: Benjamin Keith Ford <bford@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Chris Savinovich <csavinovich@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>