From adc1b8a36b723e5be30e6fe7b4a61b07f4a59fb6 Mon Sep 17 00:00:00 2001 From: Mike Ellery Date: Mon, 20 May 2019 14:46:55 -0700 Subject: [PATCH] Update package build env to boost 1.70 --- Builds/containers/centos-builder/centos_setup.sh | 2 +- Builds/containers/shared/build_deps.sh | 3 +-- Builds/containers/ubuntu-builder/ubuntu_setup.sh | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Builds/containers/centos-builder/centos_setup.sh b/Builds/containers/centos-builder/centos_setup.sh index be507d2fdd..5faadf7797 100755 --- a/Builds/containers/centos-builder/centos_setup.sh +++ b/Builds/containers/centos-builder/centos_setup.sh @@ -18,7 +18,7 @@ yum -y install \ llvm-toolset-7-lldb-devel llvm-toolset-7-python-lldb \ flex flex-devel bison bison-devel \ ncurses ncurses-devel ncurses-libs graphviz graphviz-devel \ - lzip p7zip bzip2 \ + lzip p7zip bzip2 bzip2-devel lzma-sdk lzma-sdk-devel xz-devel \ zlib zlib-devel zlib-static texinfo openssl-static \ jemalloc jemalloc-devel \ libicu-devel htop \ diff --git a/Builds/containers/shared/build_deps.sh b/Builds/containers/shared/build_deps.sh index 04b324a7a6..ba68f536cf 100755 --- a/Builds/containers/shared/build_deps.sh +++ b/Builds/containers/shared/build_deps.sh @@ -22,8 +22,7 @@ function build_boost() rm -f /tmp/boost_${boost_path}.tar.bz2 } -build_boost "1.67.0" true -build_boost "1.68.0" false +build_boost "1.70.0" true # installed in opt, so won't be used # unless specified by OPENSSL_ROOT_DIR diff --git a/Builds/containers/ubuntu-builder/ubuntu_setup.sh b/Builds/containers/ubuntu-builder/ubuntu_setup.sh index cc56b4bdde..fcc34d87e1 100755 --- a/Builds/containers/ubuntu-builder/ubuntu_setup.sh +++ b/Builds/containers/ubuntu-builder/ubuntu_setup.sh @@ -32,7 +32,8 @@ apt-get -y update apt-get -y --fix-missing install \ make cmake ninja-build ccache \ - protobuf-compiler libprotobuf-dev libssl-dev libzstd-dev \ + protobuf-compiler libprotobuf-dev libssl-dev \ + liblzma-dev libbz2-dev zlib1g-dev \ libjemalloc-dev \ python-pip \ gdb gdbserver \