From: Corey Farrell <git@cfware.com>
Date: Mon, 23 Oct 2017 06:02:22 +0000 (-0400)
Subject: Bundled pjproject: Enable pj_assert when dev-mode is enabled.
X-Git-Tag: 16.0.0-rc1~714^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb585cf185235bf653e71e690a23532271a4dda8;p=thirdparty%2Fasterisk.git

Bundled pjproject: Enable pj_assert when dev-mode is enabled.

ASTERISK-27359

Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517
---

diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile
index 7a42edcde2..9d5a9cb1c8 100644
--- a/third-party/pjproject/Makefile
+++ b/third-party/pjproject/Makefile
@@ -61,6 +61,9 @@ ifeq ($(SPECIAL_TARGETS),)
                 TARGETS += source/pjsip-apps/src/python/_pjsua.so
             endif
         endif
+        ifeq ($(AST_DEVMODE),yes)
+            CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes
+        endif
         ifeq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),MALLOC_DEBUG)
             CF += -DMALLOC_DEBUG
             MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a
diff --git a/third-party/pjproject/patches/config_site.h b/third-party/pjproject/patches/config_site.h
index 561b3a231f..a11bc06407 100644
--- a/third-party/pjproject/patches/config_site.h
+++ b/third-party/pjproject/patches/config_site.h
@@ -27,7 +27,10 @@
 #define PJMEDIA_HAS_WEBRTC_AEC 0
 
 #define PJ_HAS_IPV6 1
+#if !defined(AST_DEVMODE) && !defined(PJPROJECT_BUNDLED_ASSERTIONS)
 #define NDEBUG 1
+#endif
+
 #define PJ_MAX_HOSTNAME (256)
 #define PJSIP_MAX_URL_SIZE (512)
 #ifdef PJ_HAS_LINUX_EPOLL