Commit d901f161 authored by Rohit Gupta's avatar Rohit Gupta

minor fix to Google Protobuf logging in installation

parent 40b95f49
...@@ -164,6 +164,9 @@ compilations() { ...@@ -164,6 +164,9 @@ compilations() {
############################################ ############################################
install_protobuf_from_source(){ install_protobuf_from_source(){
protobuf_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_install_log.txt
echo_info "\nInstalling Google Protobuf from sources. The log file for Protobuf installation is here: $protobuf_install_log "
(
cd /tmp cd /tmp
echo "Downloading protobuf" echo "Downloading protobuf"
rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1 rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
...@@ -174,11 +177,14 @@ install_protobuf_from_source(){ ...@@ -174,11 +177,14 @@ install_protobuf_from_source(){
echo "Compiling protobuf" echo "Compiling protobuf"
make -j`nproc` make -j`nproc`
$SUDO make install $SUDO make install
rm -rf /tmp/protobuf-2.6.1.tar.gz /tmp/protobuf-2.6.1
$SUDO ldconfig $SUDO ldconfig
) >& $protobuf_install_log
} }
install_protobuf_c_from_source(){ install_protobuf_c_from_source(){
protobuf_c_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_c_install_log.txt
echo_info "\nInstalling Google Protobuf_C from sources. The log file for Protobuf_C installation is here: $protobuf_c_install_log "
(
cd /tmp cd /tmp
echo "Downloading protobuf-c" echo "Downloading protobuf-c"
rm -rf /tmp/protobuf-c rm -rf /tmp/protobuf-c
...@@ -189,8 +195,8 @@ install_protobuf_c_from_source(){ ...@@ -189,8 +195,8 @@ install_protobuf_c_from_source(){
echo "Compiling protobuf-c" echo "Compiling protobuf-c"
make -j`nproc` make -j`nproc`
$SUDO make install $SUDO make install
rm -rf /tmp/protobuf-c
$SUDO ldconfig $SUDO ldconfig
) >& $protobuf_c_install_log
} }
check_install_usrp_uhd_driver(){ check_install_usrp_uhd_driver(){
...@@ -396,6 +402,7 @@ remove_nettle_from_source() { ...@@ -396,6 +402,7 @@ remove_nettle_from_source() {
cd nettle-2.5/ cd nettle-2.5/
./configure --disable-openssl --enable-shared --prefix=/usr ./configure --disable-openssl --enable-shared --prefix=/usr
$SUDO make uninstall || true $SUDO make uninstall || true
$SUDO ldconfig
) >& $nettle_uninstall_log ) >& $nettle_uninstall_log
} }
...@@ -419,6 +426,7 @@ remove_gnutls_from_source(){ ...@@ -419,6 +426,7 @@ remove_gnutls_from_source(){
cd gnutls-3.1.23/ cd gnutls-3.1.23/
./configure --prefix=/usr ./configure --prefix=/usr
$SUDO make uninstall || true $SUDO make uninstall || true
$SUDO ldconfig
)>& $gnutls_uninstall_log )>& $gnutls_uninstall_log
} }
...@@ -433,6 +441,7 @@ install_asn1c_from_source(){ ...@@ -433,6 +441,7 @@ install_asn1c_from_source(){
make -j`nproc` make -j`nproc`
$SUDO make install $SUDO make install
cd - cd -
$SUDO ldconfig
) > $asn1_install_log 2>&1 ) > $asn1_install_log 2>&1
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment