mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	pjproject_bundled: Tweaks to support out-of-tree development
* pjproject is now configured with --disable-libsrtp so it will
  build correctly when doing "out-of-tree" development.  Asterisk
  doesn't use pjproject for handling media so pjproject doesn't
  need libsrtp itself.
* The pjsua app (which we used to use for the testsuite) no longer
  builds in pjproject's master branch so we just skip it.  The
  testsuite no longer needs it anyway.
See third-party/pjproject/README-hacking.md for more info on building
pjproject "out-of-tree".
(cherry picked from commit 97ad7256d7)
			
			
This commit is contained in:
		
				
					committed by
					
						 Asterisk Development Team
						Asterisk Development Team
					
				
			
			
				
	
			
			
			
						parent
						
							8c95b3c8be
						
					
				
				
					commit
					f85838fb93
				
			
							
								
								
									
										2
									
								
								third-party/pjproject/Makefile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								third-party/pjproject/Makefile
									
									
									
									
										vendored
									
									
								
							| @@ -58,6 +58,7 @@ ifeq ($(SPECIAL_TARGETS),) | ||||
|         -include source/build.mak | ||||
|         CF := $(filter-out -W%,$(CC_CFLAGS)) | ||||
|         CF := $(filter-out -I%,$(CF)) | ||||
|         ifeq ($(PJPROJECT_BUNDLED_OOT),) | ||||
|         ifeq ($(AST_DEVMODE),yes) | ||||
|             apps := source/pjsip-apps/bin/pjsua-$(TARGET_NAME) source/pjsip-apps/bin/pjsystest-$(TARGET_NAME) | ||||
|             TARGETS += $(apps) | ||||
| @@ -66,6 +67,7 @@ ifeq ($(SPECIAL_TARGETS),) | ||||
|             endif | ||||
|             CF += -DPJPROJECT_BUNDLED_ASSERTIONS=yes | ||||
|         endif | ||||
|         endif | ||||
|         MALLOC_DEBUG_LIBS = source/pjsip-apps/lib/libasterisk_malloc_debug.a | ||||
|         ifneq ($(findstring darwin,$(OSARCH)),) | ||||
|             MALLOC_DEBUG_LDFLAGS = -L$(PJDIR)/pjsip-apps/lib -Wl,-all_load -lasterisk_malloc_debug -Wl,-noall_load | ||||
|   | ||||
		Reference in New Issue
	
	Block a user