[Asterisk-code-review] install prereq: For PJProject, use latest release rather tha... (asterisk[master])

[Alexander Traud]

Alexander Traud has uploaded this change for review. ( https://gerrit.asterisk.org/7834


Change subject: install_prereq: For PJProject, use latest release rather than GIT.
......................................................................

install_prereq: For PJProject, use latest release rather than GIT.

The maintainers of PJProject (Teluu) provide a GIT mirror. However, that is just
a mirror of their Subversion. Furthermore recently, that mirror is updated only
infrequently. Finally, the state of their Subversion is sometimes incompatible
with Asterisk. Therefore, the last release version is used a source.

ASTERISK-27555

Change-Id: Icbf4b562f81f7c05bd24a3805bd46c0beb4ebd44
---
M contrib/scripts/install_prereq
1 file changed, 10 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/34/7834/1

diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index c4b91f6..09c56f1 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -142,7 +142,7 @@
 	echo "*** Installing NBS (Network Broadcast Sound) ***"
 	svn co http://svn.digium.com/svn/nbs/trunk nbs-trunk
 	cd nbs-trunk
-	make && make install
+	make all install
 	cd ..
 
 	# Only install libresample if it wasn't installed via package
@@ -150,7 +150,8 @@
 		echo "*** Installing libresample ***"
 		svn co http://svn.digium.com/svn/thirdparty/libresample/trunk libresample-trunk
 		cd libresample-trunk
-		./configure && make && make install
+		./configure
+		make all install
 		cd ..
 	fi
 
@@ -159,7 +160,8 @@
 		echo "*** Installing jansson ***"
 		wget -O - http://www.digip.org/jansson/releases/jansson-${JANSSON_VER}.tar.gz | zcat | tar -xf -
 		cd jansson-${JANSSON_VER}
-		./configure && make all && make install
+		./configure
+		make all install
 		cd ..
 		echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
 		/sbin/ldconfig
@@ -172,7 +174,7 @@
 			wget -O - http://github.com/cisco/libsrtp/archive/v2.tar.gz | zcat | tar -xf -
 			cd libsrtp-2
 			./configure --enable-openssl
-			make shared_library uninstall install
+			make shared_library install
 			cd ..
 			echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
 			/sbin/ldconfig
@@ -182,14 +184,10 @@
 	# Only install pjproject if it wasn't installed via package
 	if ! test -f /usr/include/pjlib.h; then
 		echo "*** Installing pjproject ***"
-		if [ ! -d pjproject ]; then
-			git clone https://github.com/asterisk/pjproject.git
-			cd pjproject
-		else
-			cd pjproject
-			git pull
-		fi
-		./configure CFLAGS="-DNDEBUG -DPJ_HAS_IPV6=1" --enable-shared --with-external-speex --with-external-gsm --with-external-srtp --disable-sound --disable-resample && make && make install
+		wget -O - http://www.pjsip.org/release/latest/pjproject.tar.bz2  | bzip2 -d | tar -xf -
+		cd pjproject*
+		./configure CFLAGS="-DNDEBUG -DPJ_HAS_IPV6=1" --enable-shared --with-external-speex --with-external-gsm --with-external-srtp --disable-sound --disable-resample
+		make dep all install
 		cd ..
 		echo "/usr/local/lib" > /etc/ld.so.conf.d/usr_local.conf
 		/sbin/ldconfig

-- 
To view, visit https://gerrit.asterisk.org/7834
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbf4b562f81f7c05bd24a3805bd46c0beb4ebd44
Gerrit-Change-Number: 7834
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180105/fefe32ce/attachment.html>