From 4879d6f6a86326723d32aa3315ee2cad1b8769d3 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 9 Jul 2018 10:21:08 -0700 Subject: [PATCH] buildscripts: Use "all" protobuf download to avoid ./autogen.sh This cuts ~20 seconds from the build time and avoids the need to have autoconf and libtool installed. This is the "normal" way to build protobuf. --- buildscripts/make_dependencies.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildscripts/make_dependencies.sh b/buildscripts/make_dependencies.sh index 41cb406eac..33c8e3b8fe 100755 --- a/buildscripts/make_dependencies.sh +++ b/buildscripts/make_dependencies.sh @@ -25,10 +25,9 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then # TODO(ejona): swap to `brew install --devel protobuf` once it is up-to-date else if [[ ! -d "$DOWNLOAD_DIR"/protobuf-"${PROTOBUF_VERSION}" ]]; then - wget -O - https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz | tar xz -C $DOWNLOAD_DIR + wget -O - https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-all-${PROTOBUF_VERSION}.tar.gz | tar xz -C $DOWNLOAD_DIR fi pushd $DOWNLOAD_DIR/protobuf-${PROTOBUF_VERSION} - ./autogen.sh # install here so we don't need sudo ./configure CFLAGS=-m"$ARCH" CXXFLAGS=-m"$ARCH" --disable-shared \ --prefix="$INSTALL_DIR"