Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Commit 1244002

Browse files
authored
Merge pull request #1406 from Blade-Lee/saatviks_protoexit
Resolve Protobuf early exit
2 parents 91d9525 + da0e517 commit 1244002

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

script/installation/packages.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ TF_TYPE="cpu"
4747
function install_protobuf3.4.0() {
4848
# Install Relevant tooling
4949
# Remove any old versions of protobuf
50+
# Note: Protobuf 3.5+ PPA available Ubuntu Bionic(18.04) onwards - Should be used
51+
# when we retire 16.04 too: https://launchpad.net/~maarten-fonville/+archive/ubuntu/protobuf
52+
# This PPA unfortunately doesnt have Protobuf 3.5 for 16.04, but does for 14.04/18.04+
5053
DISTRIB=$1 # ubuntu/fedora
5154
if [ "$DISTRIB" == "ubuntu" ]; then
5255
sudo apt-get --yes --force-yes remove --purge libprotobuf-dev protobuf-compiler
@@ -63,7 +66,7 @@ function install_protobuf3.4.0() {
6366
wget -O protobuf-cpp-3.4.0.tar.gz https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
6467
tar -xzf protobuf-cpp-3.4.0.tar.gz
6568
cd protobuf-3.4.0
66-
./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig
69+
./autogen.sh && ./configure && make -j4 && sudo make install && sudo ldconfig || exit 1
6770
cd ..
6871
# Cleanup
6972
rm -rf protobuf-3.4.0 protobuf-cpp-3.4.0.tar.gz

0 commit comments

Comments
 (0)