From 673e7754c29a253388c1d6188322d34f40c04657 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 6 Sep 2019 14:53:51 -0400 Subject: [PATCH 1/5] Pinned Mac builds should install Boost from source. Unpinned should install from brew. --- .cicd/platforms/macos-10.14.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index 0be904d60c0..c1196d49f2e 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -2,9 +2,9 @@ set -eo pipefail VERSION=1 brew update -brew install git boost@1.70 cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true -# install clang from source +brew install git cmake python@2 python libtool libusb graphviz automake wget gmp llvm@4 pkgconfig doxygen openssl || true if [[ ! $PINNED == false || $UNPINNED == true ]]; then + # install clang from source git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8 cd clang8 git checkout 18e41dc @@ -49,6 +49,17 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then sudo make install 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 + ./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$(getconf _NPROCESSORS_ONLN) install + cd .. + rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 +else + # install boost from brew + brew install boost || true fi # install mongoDB cd ~ From 5d2127d85ffd5ddae1cb1d4a65aab9e0c3eca488 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 6 Sep 2019 16:12:29 -0400 Subject: [PATCH 2/5] Pinned Mac builds should install Boost from source. Unpinned should install from brew. --- .cicd/platforms/macos-10.14.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index c1196d49f2e..ca8231ffe7e 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -54,7 +54,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then tar -xjf boost_1_70_0.tar.bz2 cd boost_1_70_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$(getconf _NPROCESSORS_ONLN) install + sudo ./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$(getconf _NPROCESSORS_ONLN) install cd .. rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 else From 23ad745f0559bf676f1852c34c8dcad13854908f Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Fri, 6 Sep 2019 16:32:14 -0400 Subject: [PATCH 3/5] Replace SKIP_MOJAVE with SKIP_MACOS_10_14. --- .cicd/generate-pipeline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 510f6a6ed27..a8126dad88c 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -361,7 +361,7 @@ cat < Date: Mon, 9 Sep 2019 09:34:05 -0400 Subject: [PATCH 4/5] Pinned Mac builds should install Boost from source. Unpinned should install from brew. --- .cicd/platforms/macos-10.14.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index ca8231ffe7e..2f4d70614f4 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -56,7 +56,7 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then ./bootstrap.sh --with-toolset=clang --prefix=/usr/local sudo ./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$(getconf _NPROCESSORS_ONLN) install cd .. - rm -rf boost_1_70_0.tar.bz2 /boost_1_70_0 + sudo rm -rf boost_1_70_0.tar.bz2 boost_1_70_0 else # install boost from brew brew install boost || true From 170cd116caea996fd4ee1150d209226e8d0c7b32 Mon Sep 17 00:00:00 2001 From: Scott Arnette Date: Mon, 9 Sep 2019 10:29:25 -0400 Subject: [PATCH 5/5] Removed flags from Boost install step. --- .cicd/platforms/macos-10.14.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/platforms/macos-10.14.sh b/.cicd/platforms/macos-10.14.sh index 2f4d70614f4..be31bdbe1ab 100755 --- a/.cicd/platforms/macos-10.14.sh +++ b/.cicd/platforms/macos-10.14.sh @@ -53,8 +53,8 @@ if [[ ! $PINNED == false || $UNPINNED == true ]]; then 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 - ./bootstrap.sh --with-toolset=clang --prefix=/usr/local - sudo ./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$(getconf _NPROCESSORS_ONLN) install + ./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 else