From 9d4723ca5d8be70ef6950ec9d32d133d5db6eb4f Mon Sep 17 00:00:00 2001 From: Patrik Keller Date: Mon, 21 Jan 2019 13:59:20 +0100 Subject: [PATCH 1/2] Add missing ubuntu packages The compiling documentation for Ubuntu 16.04 missed packages necessary to execute the subsequent commands. --- docs/compiling.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/compiling.rst b/docs/compiling.rst index 45eb2e3f..a0405cc7 100644 --- a/docs/compiling.rst +++ b/docs/compiling.rst @@ -24,7 +24,8 @@ Ubuntu 16.04 sudo apt install cmake libtool autoconf libboost-filesystem-dev libboost-iostreams-dev \ libboost-serialization-dev libboost-thread-dev libboost-test-dev libssl-dev libjsoncpp-dev \ libcurl4-openssl-dev libjsoncpp-dev libjsonrpccpp-dev libsnappy-dev zlib1g-dev libbz2-dev \ - liblz4-dev libzstd-dev libjemalloc-dev libsparsehash-dev python3-dev python3-pip + liblz4-dev libzstd-dev libjemalloc-dev libsparsehash-dev python3-dev python3-pip \ + git gcc-7 g++-7 git clone https://github.com/citp/BlockSci.git cd BlockSci @@ -55,4 +56,4 @@ Mac OS 10.13 sudo make install cd .. - pip3 install -e blockscipy \ No newline at end of file + pip3 install -e blockscipy From ef8dad49f64cce23ae55c91513303efc62bc531d Mon Sep 17 00:00:00 2001 From: Patrik Keller Date: Mon, 21 Jan 2019 15:03:05 +0100 Subject: [PATCH 2/2] Compile Cmake from source Adapt compilation instructions to compile recent cmake from source. Fix #177. --- docs/compiling.rst | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/compiling.rst b/docs/compiling.rst index a0405cc7..80bce29e 100644 --- a/docs/compiling.rst +++ b/docs/compiling.rst @@ -21,12 +21,22 @@ Ubuntu 16.04 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get update - sudo apt install cmake libtool autoconf libboost-filesystem-dev libboost-iostreams-dev \ + sudo apt install libtool autoconf libboost-filesystem-dev libboost-iostreams-dev \ libboost-serialization-dev libboost-thread-dev libboost-test-dev libssl-dev libjsoncpp-dev \ libcurl4-openssl-dev libjsoncpp-dev libjsonrpccpp-dev libsnappy-dev zlib1g-dev libbz2-dev \ liblz4-dev libzstd-dev libjemalloc-dev libsparsehash-dev python3-dev python3-pip \ git gcc-7 g++-7 + # get recent cmake + git clone -b release https://gitlab.kitware.com/cmake/cmake.git + cd cmake + ./bootstrap + make + make install + cd .. + # verify cmake version, should be >=3.13 now + cmake --version + git clone https://github.com/citp/BlockSci.git cd BlockSci mkdir release @@ -37,7 +47,6 @@ Ubuntu 16.04 cd .. CC=gcc-7 CXX=g++-7 sudo -H pip3 install -e blockscipy - Mac OS 10.13 --------------