[sr-dev] git:master:cee1de72: Makefile.defs: compile with system malloc for pkg if MEMPKG=sys

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: cee1de72a2b28d002bc84dd205b7ecf9f285fdd4
URL: https://github.com/kamailio/kamailio/commit/cee1de72a2b28d002bc84dd205b7ecf9f285fdd4

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-07-01T09:11:12+02:00

Makefile.defs: compile with system malloc for pkg if MEMPKG=sys

- if MEMDBGSYS=1, the use a debug variant for system malloc

---

Modified: src/Makefile.defs

---

Diff:  https://github.com/kamailio/kamailio/commit/cee1de72a2b28d002bc84dd205b7ecf9f285fdd4.diff
Patch: https://github.com/kamailio/kamailio/commit/cee1de72a2b28d002bc84dd205b7ecf9f285fdd4.patch

---

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 5de375cb02..07f938d400 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -653,9 +653,13 @@ C_DEFS= $(extra_defs) \
 	 -D__CPU_$(ARCH) $(os_defs) \
 	 -DSER_VER=$(SER_VER) \
 	 -DCFG_DIR='"$(cfg_target)"'\
-	 -DRUN_DIR='"$(run_target)"'\
-	 -DPKG_MALLOC \
-	 -DSHM_MEM  -DSHM_MMAP \
+	 -DRUN_DIR='"$(run_target)"'
+
+ifneq ($(MEMPKG), sys)
+C_DEFS+= -DPKG_MALLOC
+endif
+
+C_DEFS+= -DSHM_MEM  -DSHM_MMAP \
 	 -DDNS_IP_HACK \
 	 -DUSE_MCAST \
 	 -DUSE_TCP \
@@ -682,7 +686,7 @@ C_DEFS= $(extra_defs) \
 	 #-DSTATS \
 	 #-DNO_LOG \
 	 #-DPROFILING \
-	 #-DNO_SIG_DEBUG 
+	 #-DNO_SIG_DEBUG
 
 #PROFILE=  -pg	# set this if you want profiling
 				# you may also want to set -DPROFILING
@@ -699,8 +703,16 @@ C_DEFS+= -DF_MALLOC
 C_DEFS+= -DQ_MALLOC
 # enable TLSF malloc
 C_DEFS+= -DTLSF_MALLOC
-ifeq 	($(MEMDBG), 1)
+
+ifeq ($(MEMDBG), 1)
 	C_DEFS+= -DDBG_SR_MEMORY
+
+ifeq ($(MEMPKG), sys)
+ifeq ($(MEMDBGSYS), 1)
+	C_DEFS+= -DDBG_SYS_MEMORY
+endif
+endif
+
 endif
 
 ifneq ($(PKG_MEM_SIZE),)