Commit bef62431 authored by David Blyth's avatar David Blyth

Changed protobuf install to be through pacman

Also update proio
parent 819c5652
Pipeline #121 passed with stages
in 2 seconds
......@@ -178,25 +178,13 @@ ENV DD4hepINSTALL=/usr/local \
PYTHONPATH=/usr/local/python:${PYTHONPATH}
# Protobuf
ENV PROTOBUF_RELEASE=v3.4.1
RUN sudo pacman -S --noconfirm \
autoconf \
automake \
unzip \
protobuf \
protobuf-c \
python-protobuf \
python2-protobuf \
&& sudo rm -rf /var/cache/pacman/pkg
RUN git clone https://github.com/google/protobuf.git \
&& cd protobuf \
&& git checkout tags/$PROTOBUF_RELEASE \
&& ./autogen.sh \
&& ./configure \
--prefix=/usr/local \
&& make -j $BUILD_THREADS \
&& sudo make install \
&& cd ../ \
&& rm -rf protobuf
# lz4
ENV LZ4_RELEASE=v1.8.0
......@@ -210,7 +198,7 @@ RUN git clone https://github.com/lz4/lz4.git \
# proio
ENV GOPATH=/opt/Go
ENV PROIO_CHECKOUT=4bfb8db8b6b8069e5c5023d3bcdc541d2190bbb6 \
ENV PROIO_CHECKOUT=5e7b71b112a10b31061df15a3919bc22beccba9d \
PROIO_SOURCE=$GOPATH/src/github.com/decibelcooper/proio \
PATH=$GOPATH/bin:${PATH}
......
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