git.iko.soy/stackage
on master help sign in
debian-bootstrap.sh: take protobuf and sodium from Ubuntu
a194722Jens Petersen
debian-bootstrap.sh+3−15
compare with master
unifiedsplit
@@ -90,6 +90,7 @@ apt-get install -y \
90 libpango1.0-dev \
90 libpango1.0-dev \
91 libpcap0.8-dev \
91 libpcap0.8-dev \
92 libpq-dev \
92 libpq-dev \
93+ libprotobuf-dev \
93 libre2-dev \
94 libre2-dev \
94 librocksdb-dev \
95 librocksdb-dev \
95 libsdl1.2-dev \
96 libsdl1.2-dev \
@@ -100,6 +101,7 @@ apt-get install -y \
100 libsdl2-ttf-dev \
101 libsdl2-ttf-dev \
101 libsnappy-dev \
102 libsnappy-dev \
102 libsndfile1-dev \
103 libsndfile1-dev \
104+ libsodium-dev \
103 libsox-dev \
105 libsox-dev \
104 libsqlite3-dev \
106 libsqlite3-dev \
105 libssl-dev \
107 libssl-dev \
@@ -215,31 +217,17 @@ echo "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/" > /etc/ld.so.conf
215ERLANG_VERSION="20.2.2"
217ERLANG_VERSION="20.2.2"
216ERLANG_DEB_FILE="esl-erlang_21.2-1~ubuntu~bionic_amd64.deb"
218ERLANG_DEB_FILE="esl-erlang_21.2-1~ubuntu~bionic_amd64.deb"
217pushd /tmp \
219pushd /tmp \
218− && wget http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_general/${ERLANG_DEB_FILE}
220+ && wget http://packages.erlang-solutions.com/site/esl/esl-erlang/FLAVOUR_1_general/${ERLANG_DEB_FILE} \
219 && (dpkg -i ${ERLANG_DEB_FILE}; apt-get install -yf) \
221 && (dpkg -i ${ERLANG_DEB_FILE}; apt-get install -yf) \
220 && rm ${ERLANG_DEB_FILE} \
222 && rm ${ERLANG_DEB_FILE} \
221 && popd
223 && popd
222
224
223−# Install version 3 of the protobuf compiler. (The `protobuf-compiler` package only
224−# supports version 2.)
225−curl -OL https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip \
226− && sudo unzip -o protoc-3.3.0-linux-x86_64.zip -d /usr bin/protoc \
227− && rm -f protoc-3.3.0-linux-x84_64.zip
228−
229# Install the TensorFlow C API.
225# Install the TensorFlow C API.
230curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
226curl https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.1.0.tar.gz > libtensorflow.tar.gz \
231 && sudo tar zxf libtensorflow.tar.gz -C /usr \
227 && sudo tar zxf libtensorflow.tar.gz -C /usr \
232 && rm libtensorflow.tar.gz \
228 && rm libtensorflow.tar.gz \
233 && ldconfig
229 && ldconfig
234
230
235−# Install libsodium
236−curl https://download.libsodium.org/libsodium/releases/LATEST.tar.gz > libsodium.tar.gz \
237− && sudo tar xfz libsodium.tar.gz -C /tmp \
238− && rm libsodium.tar.gz \
239− && cd /tmp/libsodium-stable \
240− && ./configure \
241− && make install
242−
243# Install secp256k1
231# Install secp256k1
244cd /tmp \
232cd /tmp \
245 && git clone https://github.com/bitcoin-core/secp256k1.git \
233 && git clone https://github.com/bitcoin-core/secp256k1.git \