From b0259393e5489fd449fe1b0c63d5ff0443070c8b Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 20 Sep 2019 09:38:50 -0400 Subject: [PATCH 1/3] Upgrade to boost_1_71_0 --- .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 8 ++++---- .cicd/platforms/amazon_linux-2.dockerfile | 8 ++++---- .cicd/platforms/centos-7.6-unpinned.dockerfile | 8 ++++---- .cicd/platforms/centos-7.6.dockerfile | 8 ++++---- .cicd/platforms/macos-10.14.sh | 8 ++++---- .cicd/platforms/ubuntu-16.04.dockerfile | 8 ++++---- .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 8 ++++---- .cicd/platforms/ubuntu-18.04.dockerfile | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile index 3a4110c69f6..ef4f154b4bc 100644 --- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile +++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile @@ -16,13 +16,13 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ cd / && \ rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2 # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --prefix=/usr/local && \ ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \ tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \ diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile index 6cdaddf0d7c..d6ef339b792 100644 --- a/.cicd/platforms/amazon_linux-2.dockerfile +++ b/.cicd/platforms/amazon_linux-2.dockerfile @@ -43,13 +43,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \ tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \ diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile index 613da74ad7d..114aa3aca50 100644 --- a/.cicd/platforms/centos-7.6-unpinned.dockerfile +++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile @@ -33,15 +33,15 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ source /opt/rh/devtoolset-8/enable && \ source /opt/rh/rh-python36/enable && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --prefix=/usr/local && \ ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \ tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \ diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile index 6e42a57f688..6f549b38d3f 100644 --- a/.cicd/platforms/centos-7.6.dockerfile +++ b/.cicd/platforms/centos-7.6.dockerfile @@ -52,13 +52,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-amazon-3.6.3.tgz && \ tar -xzf mongodb-linux-x86_64-amazon-3.6.3.tgz && \ diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index fe124319d19..92704cce092 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -50,13 +50,13 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then cd ../.. rm -rf clang8 # install boost from source - curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 - tar -xjf boost_1_70_0.tar.bz2 - cd boost_1_70_0 + curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 + tar -xjf boost_1_71_0.tar.bz2 + cd boost_1_71_0 ./bootstrap.sh --prefix=/usr/local sudo ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(getconf _NPROCESSORS_ONLN) install cd .. - sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0 + sudo rm -rf boost_1_71_0.tar.bz2 boost_1_71_0 else # install boost from brew brew install boost || true diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile index 8dc07bc2228..01484cfbd31 100644 --- a/.cicd/platforms/ubuntu-16.04.dockerfile +++ b/.cicd/platforms/ubuntu-16.04.dockerfile @@ -44,13 +44,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \ tar -xzf mongodb-linux-x86_64-ubuntu1604-3.6.3.tgz && \ diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile index cb7473ca98a..143d4d6e3f7 100644 --- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile +++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile @@ -18,13 +18,13 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ cd / && \ rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2 # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --prefix=/usr/local && \ ./b2 --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \ tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \ diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile index 20072008e6d..6354f938cea 100644 --- a/.cicd/platforms/ubuntu-18.04.dockerfile +++ b/.cicd/platforms/ubuntu-18.04.dockerfile @@ -45,13 +45,13 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2 && \ - tar -xjf boost_1_70_0.tar.bz2 && \ - cd boost_1_70_0 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ + tar -xjf boost_1_71_0.tar.bz2 && \ + cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ ./b2 toolset=clang cxxflags='-stdlib=libc++ -D__STRICT_ANSI__ -nostdinc++ -I/usr/local/include/c++/v1' linkflags='-stdlib=libc++' link=static threading=multi --with-iostreams --with-date_time --with-filesystem --with-system --with-program_options --with-chrono --with-test -q -j$(nproc) install && \ cd / && \ - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + rm -rf boost_1_71_0.tar.bz2 /boost_1_71_0 # build mongodb RUN curl -LO http://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \ tar -xzf mongodb-linux-x86_64-ubuntu1804-4.1.1.tgz && \ From 9e7a610b09a96501b2036d5760f24e7da76b885b Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 20 Sep 2019 10:35:08 -0400 Subject: [PATCH 2/3] Fix boost link --- .cicd/platforms/amazon_linux-2-unpinned.dockerfile | 2 +- .cicd/platforms/amazon_linux-2.dockerfile | 2 +- .cicd/platforms/centos-7.6-unpinned.dockerfile | 2 +- .cicd/platforms/centos-7.6.dockerfile | 2 +- .cicd/platforms/macos-10.14.sh | 2 +- .cicd/platforms/ubuntu-16.04.dockerfile | 2 +- .cicd/platforms/ubuntu-18.04-unpinned.dockerfile | 2 +- .cicd/platforms/ubuntu-18.04.dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile index ef4f154b4bc..8dfa0be6695 100644 --- a/.cicd/platforms/amazon_linux-2-unpinned.dockerfile +++ b/.cicd/platforms/amazon_linux-2-unpinned.dockerfile @@ -16,7 +16,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ cd / && \ rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2 # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --prefix=/usr/local && \ diff --git a/.cicd/platforms/amazon_linux-2.dockerfile b/.cicd/platforms/amazon_linux-2.dockerfile index d6ef339b792..55df25e33be 100644 --- a/.cicd/platforms/amazon_linux-2.dockerfile +++ b/.cicd/platforms/amazon_linux-2.dockerfile @@ -43,7 +43,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ diff --git a/.cicd/platforms/centos-7.6-unpinned.dockerfile b/.cicd/platforms/centos-7.6-unpinned.dockerfile index 114aa3aca50..21b8d03ea74 100644 --- a/.cicd/platforms/centos-7.6-unpinned.dockerfile +++ b/.cicd/platforms/centos-7.6-unpinned.dockerfile @@ -33,7 +33,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ source /opt/rh/devtoolset-8/enable && \ source /opt/rh/rh-python36/enable && \ tar -xjf boost_1_71_0.tar.bz2 && \ diff --git a/.cicd/platforms/centos-7.6.dockerfile b/.cicd/platforms/centos-7.6.dockerfile index 6f549b38d3f..734b240c0b1 100644 --- a/.cicd/platforms/centos-7.6.dockerfile +++ b/.cicd/platforms/centos-7.6.dockerfile @@ -52,7 +52,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index 92704cce092..363365bc3a7 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -50,7 +50,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then cd ../.. rm -rf clang8 # install boost from source - curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 + curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 tar -xjf boost_1_71_0.tar.bz2 cd boost_1_71_0 ./bootstrap.sh --prefix=/usr/local diff --git a/.cicd/platforms/ubuntu-16.04.dockerfile b/.cicd/platforms/ubuntu-16.04.dockerfile index 01484cfbd31..d93c21afc04 100644 --- a/.cicd/platforms/ubuntu-16.04.dockerfile +++ b/.cicd/platforms/ubuntu-16.04.dockerfile @@ -44,7 +44,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ diff --git a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile index 143d4d6e3f7..148762a72c1 100644 --- a/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile +++ b/.cicd/platforms/ubuntu-18.04-unpinned.dockerfile @@ -18,7 +18,7 @@ RUN curl -LO https://cmake.org/files/v3.13/cmake-3.13.2.tar.gz && \ cd / && \ rm -rf cmake-3.13.2.tar.gz /cmake-3.13.2 # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --prefix=/usr/local && \ diff --git a/.cicd/platforms/ubuntu-18.04.dockerfile b/.cicd/platforms/ubuntu-18.04.dockerfile index 6354f938cea..79d30a25f16 100644 --- a/.cicd/platforms/ubuntu-18.04.dockerfile +++ b/.cicd/platforms/ubuntu-18.04.dockerfile @@ -45,7 +45,7 @@ RUN git clone --depth 1 --single-branch --branch release_80 https://github.com/l cd / && \ rm -rf /llvm # build boost -RUN curl -LO https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_71_0.tar.bz2 && \ +RUN curl -LO https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2 && \ tar -xjf boost_1_71_0.tar.bz2 && \ cd boost_1_71_0 && \ ./bootstrap.sh --with-toolset=clang --prefix=/usr/local && \ From 3f2828743a41caa8ba38a7d52df974d52fe8e1da Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Fri, 20 Sep 2019 13:04:36 -0400 Subject: [PATCH 3/3] Upgrade to Boost 1.71.0 --- scripts/.build_vars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/.build_vars b/scripts/.build_vars index 8e85e5ac675..75dc9a38c10 100644 --- a/scripts/.build_vars +++ b/scripts/.build_vars @@ -30,7 +30,7 @@ export INSTALL_MONGO=${INSTALL_MONGO:-false} # BOOST export BOOST_VERSION_MAJOR=1 -export BOOST_VERSION_MINOR=70 +export BOOST_VERSION_MINOR=71 export BOOST_VERSION_PATCH=0 export BOOST_VERSION=${BOOST_VERSION_MAJOR}_${BOOST_VERSION_MINOR}_${BOOST_VERSION_PATCH} export BOOST_ROOT=${BOOST_LOCATION:-${SRC_DIR}/boost_${BOOST_VERSION}}