kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 19:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "build: Various OpenBSD issues"

Browse Source
This commit is contained in:
zuul
2016-11-18 08:31:46 -06:00
committed by Gerrit Code Review
parent 98b3b500dc 935f5d003b
commit 782985631e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/Makefile
View File

@@ -279,15 +279,15 @@ ASTPJ_LIB:=libasteriskpj.so
libasteriskpj.exports: $(ASTTOPDIR)/$(PJPROJECT_DIR)/pjproject.symbols libasteriskpj.exports: $(ASTTOPDIR)/$(PJPROJECT_DIR)/pjproject.symbols
$(ECHO_PREFIX) echo " [GENERATE] libasteriskpj.exports" $(ECHO_PREFIX) echo " [GENERATE] libasteriskpj.exports"
ifeq ($(GNU_LD),1) ifeq ($(GNU_LD),1)
$(CMD_PREFIX) echo -e "{\n\tglobal:" > libasteriskpj.exports $(CMD_PREFIX) echo -e "{\nglobal:" > libasteriskpj.exports
$(CMD_PREFIX) sed -r -e "s/.*/\t\t$(LINKER_SYMBOL_PREFIX)&;/" $(ASTTOPDIR)/$(PJPROJECT_DIR)/pjproject.symbols >> libasteriskpj.exports $(CMD_PREFIX) sed -r -e "s/.*/$(LINKER_SYMBOL_PREFIX)&;/" $(ASTTOPDIR)/$(PJPROJECT_DIR)/pjproject.symbols >> libasteriskpj.exports
$(CMD_PREFIX) echo -e "\t\t$(LINKER_SYMBOL_PREFIX)ast_pj_init;\n" >> libasteriskpj.exports $(CMD_PREFIX) echo -e "$(LINKER_SYMBOL_PREFIX)ast_pj_init;\n" >> libasteriskpj.exports
$(CMD_PREFIX) echo -e "\tlocal:\n\t\t*;\n};" >> libasteriskpj.exports $(CMD_PREFIX) echo -e "local:\n*;\n};" >> libasteriskpj.exports
endif endif
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB) $(PJ_LDFLAGS) $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB) $(PJ_LDFLAGS)
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS) $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lrt -lpthread $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread
ifeq ($(GNU_LD),1) ifeq ($(GNU_LD),1)
$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
endif endif

2
res/res_rtp_asterisk.c
View File

@@ -1365,7 +1365,7 @@ static int ast_rtp_dtls_set_configuration(struct ast_rtp_instance *instance, con
return 0; return 0;
} }
#if OPENSSL_VERSION_NUMBER < 0x10002000L #if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
rtp->ssl_ctx = SSL_CTX_new(DTLSv1_method()); rtp->ssl_ctx = SSL_CTX_new(DTLSv1_method());
#else #else
rtp->ssl_ctx = SSL_CTX_new(DTLS_method()); rtp->ssl_ctx = SSL_CTX_new(DTLS_method());

6
third-party/pjproject/Makefile vendored
View File

@@ -193,9 +193,9 @@ clean:
$(ECHO_PREFIX) Cleaning $(ECHO_PREFIX) Cleaning
+-$(CMD_PREFIX) test -d source && ($(SUBMAKE) -C source clean || : ;\ +-$(CMD_PREFIX) test -d source && ($(SUBMAKE) -C source clean || : ;\
rm -rf source/pjsip-apps/bin/* || : ;\ rm -rf source/pjsip-apps/bin/* || : ;\
find source -name *.a -delete ;\ find source -name *.a | xargs rm -rf ;\
find source -name *.o -delete ;\ find source -name *.o | xargs rm -rf ;\
find source -name *.so -delete ; ) || : find source -name *.so | xargs rm -rf ; ) || :
-$(CMD_PREFIX) rm -rf pjproject.symbols -$(CMD_PREFIX) rm -rf pjproject.symbols
distclean: distclean: