File tree Expand file tree Collapse file tree 4 files changed +11
-11
lines changed
Expand file tree Collapse file tree 4 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -53,12 +53,12 @@ RUN BOOST_VERSION=$(dep-version.py boost) && \
5353
5454# Download and compile protobuf
5555RUN PROTOBUF_VERSION=$(dep-version.py protobuf) && \
56- curl -O -L https://github.com/google /protobuf/releases/download/v${ PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION} .tar.gz && \
57- tar xfz protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz && \
56+ curl -O -L https://github.com/protocolbuffers /protobuf/archive/v$ PROTOBUF_VERSION.tar.gz && \
57+ tar zxf v ${PROTOBUF_VERSION}.tar.gz && \
5858 cd protobuf-${PROTOBUF_VERSION}/ && \
5959 CXXFLAGS=-fPIC ./configure && \
6060 make -j8 && make install && \
61- rm -rf /protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
61+ rm -rf /v ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
6262
6363# ZLib
6464RUN ZLIB_VERSION=$(dep-version.py zlib) && \
Original file line number Diff line number Diff line change @@ -58,12 +58,12 @@ RUN CMAKE_VERSION=$(dep-version.py cmake) && \
5858
5959# Download and compile protobuf
6060RUN PROTOBUF_VERSION=$(dep-version.py protobuf) && \
61- curl -O -L https://github.com/google /protobuf/releases/download/v${ PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION} .tar.gz && \
62- tar xfz protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz && \
61+ curl -O -L https://github.com/protocolbuffers /protobuf/archive/v$ PROTOBUF_VERSION.tar.gz && \
62+ tar zxf v ${PROTOBUF_VERSION}.tar.gz && \
6363 cd protobuf-${PROTOBUF_VERSION}/ && \
6464 CXXFLAGS=-fPIC ./configure && \
6565 make -j8 && make install && ldconfig && \
66- rm -rf /protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
66+ rm -rf /v ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
6767
6868# ZLib
6969RUN ZLIB_VERSION=$(dep-version.py zlib) && \
Original file line number Diff line number Diff line change 9696
9797if [ ! -f protobuf-${PROTOBUF_VERSION} /.done ]; then
9898 echo " Building Protobuf $PROTOBUF_VERSION "
99- curl -O -L https://github.com/google /protobuf/releases/download/v ${ PROTOBUF_VERSION} /protobuf-cpp- ${PROTOBUF_VERSION} .tar.gz
100- tar zxf protobuf-cpp- ${PROTOBUF_VERSION} .tar.gz
99+ curl -O -L https://github.com/protocolbuffers /protobuf/archive/v $ PROTOBUF_VERSION .tar.gz
100+ tar zxf v ${PROTOBUF_VERSION} .tar.gz
101101 pushd protobuf-${PROTOBUF_VERSION}
102102 pushd cmake/
103103 # Build protoc that can run on both x86 and arm architectures
Original file line number Diff line number Diff line change @@ -59,12 +59,12 @@ RUN CMAKE_VERSION=$(dep-version.py cmake) && \
5959
6060# Download and compile protobuf
6161RUN PROTOBUF_VERSION=$(dep-version.py protobuf) && \
62- curl -O -L https://github.com/google /protobuf/releases/download/v${ PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION} .tar.gz && \
63- tar xfz protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz && \
62+ curl -O -L https://github.com/protocolbuffers /protobuf/archive/v$ PROTOBUF_VERSION.tar.gz && \
63+ tar zxf v ${PROTOBUF_VERSION}.tar.gz && \
6464 cd protobuf-${PROTOBUF_VERSION}/ && \
6565 CXXFLAGS=-fPIC ./configure && \
6666 make -j8 && make install && ldconfig && \
67- rm -rf /protobuf-cpp- ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
67+ rm -rf /v ${PROTOBUF_VERSION}.tar.gz /protobuf-${PROTOBUF_VERSION}
6868
6969# ZLib
7070RUN ZLIB_VERSION=$(dep-version.py zlib) && \
You can’t perform that action at this time.
0 commit comments