diff options
author | George Joseph <gjoseph@digium.com> | 2016-04-30 16:52:47 -0600 |
---|---|---|
committer | George Joseph <gjoseph@digium.com> | 2016-05-03 06:54:29 -0600 |
commit | f39089f17cc3df6f795914d664c5ddbe41027498 (patch) | |
tree | f73392efbce6ae58f4836f115ee699564e8cdbd4 /main | |
parent | 69ced86c6c1847e5c4b683e35ccd407f3eff594a (diff) |
pjproject_bundled: Various fixes discovered during testing of OSes
For all OSes:
* Disabled third-party codecs in pjproject and added
'--disable-speex-codec --disable-speex-aec --disable-gsm-codec' to the
configure options since we don't use the pjsip codec capability.
FreeBSD:
* Added FreeBSD support to install_prereq.
* Changed pjproject/configure.m4 to use $GNU_MAKE instead of hardcoding "make".
* Added __progname and environ to asterisk.exports.in.
* Reverted the use of ldconfig to create shared library symlinks to ln.
* Only enable epoll in pjproject if `uname -s` is Linux.
* Added a patch to pjproject to take the name of the 'make' command from
an environment variable if supplied. This is needed for the python bindings.
(merged by Teluu into pjproject trunk 5/3/2016)
FreeBSD support isn't complete. Still some general issues regarding
make/gmake having nothing to do with pjproject. With some handholding it DOES
build successfully.
CentOS:
Added 'patch' and 'bzip2' to install_prereq PACKAGES_RH.
CentOS 6/7 32/64 build and run the pjsip testsuite successfully.
Ubuntu:
No changes required.
Ubuntu 15/16 32/64 build and run the pjsip testsuite successfully.
Debian:
No changes required.
Debian 6/7/8 32/64 build and run the pjsip testsuite successfully.
There will utimately be a follow-up patch to create an install_prereq for
the testsuite as I've discovered a few missing requirements.
ASTERISK-25968 #close
Change-Id: I5756a07facfc63798115a5e73a8709382fe9259c
Diffstat (limited to 'main')
-rw-r--r-- | main/Makefile | 12 | ||||
-rw-r--r-- | main/asterisk.exports.in | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/main/Makefile b/main/Makefile index a64eabcde..13f1c9cf5 100644 --- a/main/Makefile +++ b/main/Makefile @@ -224,11 +224,7 @@ endif $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) $(ECHO_PREFIX) echo " [LN] $< -> $@" - $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \ - $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\ - else \ - $(LN) -sf $< $@ ;\ - fi + $(LN) -sf $< $@ ;\ else # Darwin ASTSSL_LIB:=libasteriskssl.dylib @@ -304,11 +300,7 @@ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): libasteriskpj.o libasteriskpj.exports $(ASTPJ_LIB): $(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(ECHO_PREFIX) echo " [LN] $< -> $@" - $(CMD_PREFIX) if [ -x "$(LDCONFIG)" ] ; then \ - $(LDCONFIG) $(LDCONFIG_FLAGS) . 2>/dev/null ;\ - else \ - $(LN) -sf $< $@ ;\ - fi + $(LN) -sf $< $@ ;\ else # Darwin ASTPJ_LIB:=libasteriskpj.dylib diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in index 364b3b05e..f997587c9 100644 --- a/main/asterisk.exports.in +++ b/main/asterisk.exports.in @@ -49,6 +49,8 @@ LINKER_SYMBOL_PREFIXres_srtp; LINKER_SYMBOL_PREFIXres_srtp_policy; LINKER_SYMBOL_PREFIXsecure_call_info; + LINKER_SYMBOL_PREFIX__progname; + LINKER_SYMBOL_PREFIXenviron; /* If _IO_stdin_used is not exported, stdout/stderr may not get |