mirror of https://github.com/asterisk/asterisk
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: I5756a07facfc63798115a5e73a8709382fe9259cchanges/48/2748/1
George Joseph
9 years ago
parent
9c4c4a7d0d
commit
e61716b774
@ -1,7 +1,10 @@
|
||||
PJPROJECT_URL = http://www.pjsip.org/release/$(PJPROJECT_VERSION)
|
||||
|
||||
# Even though we're not installing pjproject, we're setting prefix to /opt/pjproject to be safe
|
||||
PJPROJECT_CONFIG_OPTS = --prefix=/opt/pjproject --with-external-speex --with-external-gsm --with-external-srtp \
|
||||
--disable-video --disable-v4l2 --disable-sound --disable-opencore-amr --disable-ilbc-codec \
|
||||
--without-libyuv --disable-g7221-codec \
|
||||
--enable-epoll
|
||||
PJPROJECT_CONFIG_OPTS = --prefix=/opt/pjproject --disable-speex-codec --disable-speex-aec \
|
||||
--disable-gsm-codec --disable-video --disable-v4l2 --disable-sound --disable-opencore-amr \
|
||||
--disable-ilbc-codec --without-libyuv --disable-g7221-codec
|
||||
|
||||
ifeq ($(shell uname -s),Linux)
|
||||
PJPROJECT_CONFIG_OPTS += --enable-epoll
|
||||
endif
|
||||
|
||||
@ -0,0 +1,51 @@
|
||||
From 61668b8fcaa0f2a8a05100097284c0c427600033 Mon Sep 17 00:00:00 2001
|
||||
From: George Joseph <george.joseph@fairview5.com>
|
||||
Date: Mon, 2 May 2016 17:08:15 -0600
|
||||
Subject: [PATCH] pjsip-apps/src/python/setup.py: Take "make" from the
|
||||
environment
|
||||
|
||||
With "make" hard coded in setup.py, it chokes on FreeBSD because the system
|
||||
make command isn't GNU compatibile. This patch allows setup.py to take the
|
||||
name of the make command from the MAKE environment variable if it exists.
|
||||
If it doesn't, it defaults to "make".
|
||||
---
|
||||
pjsip-apps/src/python/setup.py | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pjsip-apps/src/python/setup.py b/pjsip-apps/src/python/setup.py
|
||||
index 69a9859..ea1427d 100644
|
||||
--- a/pjsip-apps/src/python/setup.py
|
||||
+++ b/pjsip-apps/src/python/setup.py
|
||||
@@ -60,25 +60,25 @@ if pj_version_suffix:
|
||||
pj_version += "-" + pj_version_suffix
|
||||
|
||||
#print 'PJ_VERSION = "'+ pj_version + '"'
|
||||
-
|
||||
+MAKE = os.environ.get('MAKE') or "make"
|
||||
|
||||
# Fill in pj_inc_dirs
|
||||
pj_inc_dirs = []
|
||||
-f = os.popen("make -f helper.mak inc_dir")
|
||||
+f = os.popen("%s -f helper.mak inc_dir" % MAKE)
|
||||
for line in f:
|
||||
pj_inc_dirs.append(line.rstrip("\r\n"))
|
||||
f.close()
|
||||
|
||||
# Fill in pj_lib_dirs
|
||||
pj_lib_dirs = []
|
||||
-f = os.popen("make -f helper.mak lib_dir")
|
||||
+f = os.popen("%s -f helper.mak lib_dir" % MAKE)
|
||||
for line in f:
|
||||
pj_lib_dirs.append(line.rstrip("\r\n"))
|
||||
f.close()
|
||||
|
||||
# Fill in pj_libs
|
||||
pj_libs = []
|
||||
-f = os.popen("make -f helper.mak libs")
|
||||
+f = os.popen("%s -f helper.mak libs" % MAKE)
|
||||
for line in f:
|
||||
pj_libs.append(line.rstrip("\r\n"))
|
||||
f.close()
|
||||
--
|
||||
2.5.5
|
||||
|
||||
Loading…
Reference in new issue