diff options
| author | Kargatum <dowlandtop@yandex.com> | 2021-05-23 18:53:15 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-23 13:53:15 +0200 |
| commit | 50adcf206567dbf5d44b4424ab771f8f427bd4f2 (patch) | |
| tree | 924b2e72a7f69b2e5d081e3f6530b07439677c88 /apps/installer/includes | |
| parent | af28aeebde8f8d9dec96259a594af595e1308d33 (diff) | |
feat(Deps/Boost): add boost support (#5676)
* feat(Deps/Boost): add boost support
* 1
* 2
* to 1.74
Diffstat (limited to 'apps/installer/includes')
| -rw-r--r-- | apps/installer/includes/os_configs/debian.sh | 1 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/osx.sh | 2 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/ubuntu.sh | 15 |
3 files changed, 12 insertions, 6 deletions
diff --git a/apps/installer/includes/os_configs/debian.sh b/apps/installer/includes/os_configs/debian.sh index 35346491ff..531c0092a7 100644 --- a/apps/installer/includes/os_configs/debian.sh +++ b/apps/installer/includes/os_configs/debian.sh @@ -12,6 +12,7 @@ sudo apt-get install -y gdbserver gdb unzip curl libace-6.* libace-dev \ if [[ $DEBIAN_VERSION -eq "10" ]]; then sudo apt-get install -y default-libmysqlclient-dev libssl-dev libreadline-dev libncurses-dev mariadb-server + libboost-system1.6*-dev libboost-filesystem1.6*-dev libboost-program-options1.6*-dev libboost-iostreams1.6*-dev \ else # Debian 8 and 9 should work using this sudo apt-get install -y libmysqlclient-dev libssl1.0-dev mysql-server fi diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index a897ae58a4..1eca16b3bb 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -13,4 +13,4 @@ if ! command -v cmake &>/dev/null ; then fi ########################################## -brew install openssl readline ace bash-completion curl unzip mysql ccache +brew install openssl readline ace boost bash-completion curl unzip mysql ccache diff --git a/apps/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh index c57a453d2c..949c8d0bca 100644 --- a/apps/installer/includes/os_configs/ubuntu.sh +++ b/apps/installer/includes/os_configs/ubuntu.sh @@ -1,15 +1,20 @@ -if ! command -v lsb_release &>/dev/null ; then - sudo apt-get install -y lsb-release -fi +# if ! command -v lsb_release &>/dev/null ; then +# sudo apt-get install -y lsb-release +# fi -UBUNTU_VERSION=$(lsb_release -sr); +# UBUNTU_VERSION=$(lsb_release -sr); -sudo apt-get update -y +# Added repo for newest lib +sudo add-apt-repository -y ppa:mhier/libboost-latest +sudo apt update # shared deps sudo apt-get -y install make cmake clang curl unzip libmysqlclient-dev libace-dev ccache google-perftools +# Insstall boost 1.74 from ppa:mhier/libboost-latest for all os versions +sudo apt-get -y install libboost1.74-dev + if [[ $CONTINUOUS_INTEGRATION || $DOCKER ]]; then sudo apt-get -y install build-essential libtool cmake-data openssl libgoogle-perftools-dev \ libssl-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev mysql-client \ |