mirror of https://github.com/grpc/grpc-java.git
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.
This commit is contained in:
parent
ffcb3b964b
commit
4879d6f6a8
|
|
@ -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
|
# TODO(ejona): swap to `brew install --devel protobuf` once it is up-to-date
|
||||||
else
|
else
|
||||||
if [[ ! -d "$DOWNLOAD_DIR"/protobuf-"${PROTOBUF_VERSION}" ]]; then
|
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
|
fi
|
||||||
pushd $DOWNLOAD_DIR/protobuf-${PROTOBUF_VERSION}
|
pushd $DOWNLOAD_DIR/protobuf-${PROTOBUF_VERSION}
|
||||||
./autogen.sh
|
|
||||||
# install here so we don't need sudo
|
# install here so we don't need sudo
|
||||||
./configure CFLAGS=-m"$ARCH" CXXFLAGS=-m"$ARCH" --disable-shared \
|
./configure CFLAGS=-m"$ARCH" CXXFLAGS=-m"$ARCH" --disable-shared \
|
||||||
--prefix="$INSTALL_DIR"
|
--prefix="$INSTALL_DIR"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue