diff options
| author | George Joseph <gjoseph@digium.com> | 2017-01-08 09:29:01 -0700 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2017-01-08 10:37:41 -0600 |
| commit | e54c8aec343b43745ab9d241f6c5336fdb2a29a3 (patch) | |
| tree | 2976d9193c21f5870ec05e1e37bd6d8372959ea9 /third-party | |
| parent | 6962a13466c5e5b42e029f6d79da5262565317b3 (diff) | |
pjproject_bundled: Fix compilation with MALLOC_DEBUG
When MALLOC_DEBUG was specified, make was failing. Immediately
remaking would work. The issues was in the ordering of the make
dependencies.
Change-Id: If6030b54fc693f3179f32bfd20c6b5d5f1b3f7cd
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/pjproject/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index f4cce73bf..2398ec428 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -63,11 +63,8 @@ ifeq ($(SPECIAL_TARGETS),) endif ifeq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),MALLOC_DEBUG) CF += -DMALLOC_DEBUG - MALLOC_DEBUG = yes - $(apps): export LDFLAGS += -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive - $(apps): source/pjsip-apps/lib/libasterisk_malloc_debug.a - source/pjsip-apps/src/python/_pjsua.so: LDFLAGS += -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive - source/pjsip-apps/src/python/_pjsua.so: source/pjsip-apps/lib/libasterisk_malloc_debug.a + MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a + MALLOC_DEBUG_LDFLAGS = -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive endif ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) CF += -O3 @@ -191,7 +188,8 @@ source/pjsip-apps/lib/libasterisk_malloc_debug.a: source/pjsip-apps/lib/asterisk $(apps): APP = $(filter pj%,$(subst -, ,$(notdir $@))) $(apps): CFLAGS += -DPJ_LOG_MAX_LEVEL=2 -$(apps): pjproject.symbols $(APP_THIRD_PARTY_LIB_FILES) +$(apps): LDFLAGS += $(MALLOC_DEBUG_LDFLAGS) +$(apps): $(MALLOC_DEBUG_LIBS) pjproject.symbols $(APP_THIRD_PARTY_LIB_FILES) $(ECHO_PREFIX) Compiling $(APP) $(CMD_PREFIX) +$(MAKE) -C source/pjsip-apps/build $(filter pj%,$(subst -, ,$(notdir $@))) $(REALLY_QUIET) @@ -200,6 +198,7 @@ source/pjsip-apps/src/python/_pjsua.o: source/pjsip-apps/src/python/_pjsua.c $(a $(ECHO_PREFIX) Compiling python bindings $(CMD_PREFIX) $(CC) -o $@ -c $< $(PYTHONDEV_INCLUDE) $(CFLAGS) $(PJ_CFLAGS) +source/pjsip-apps/src/python/_pjsua.so: LDFLAGS += $(MALLOC_DEBUG_LDFLAGS) source/pjsip-apps/src/python/_pjsua.so: source/pjsip-apps/src/python/_pjsua.o $(ECHO_PREFIX) Linking python bindings $(@F) $(CMD_PREFIX) gcc -shared -pthread -o $@ $< $(LDFLAGS) $(PJ_LDFLAGS) $(APP_LDLIBS) $(PYTHONDEV_LIB) $(REALLY_QUIET) |