Update boost-for-android for Android NDK r20 and disable macOS Homebr…

…ew. (#1185) * Update boost-for-android for Android NDK r20. * Also disable homebrew. * I mean homebrew I said! * Apparently Android isn't ready for Boost 1.70 yet.
microsoft · Jul 12, 2019 · 643dc60 · 643dc60
1 parent 951e269
commit 643dc60
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 44 deletions.
diff --git a/Build_android/configure.sh b/Build_android/configure.sh
@@ -155,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then (
 if [ "${DO_BOOST}" == "1" ]; then (
     if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi
     cd Boost-for-Android
-    git checkout b1e2cb397d3ec573f1cfdf4f4d965766204c53f1
+    git checkout aed656a97fb3af7322fd2c3da5995a2d09d87d4b
     PATH="$PATH:$NDK_DIR" \
     CXXFLAGS="-std=gnu++11" \
     ./build-android.sh \

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -222,49 +222,50 @@ jobs:
         export NCPU=2
         ../configure.sh --ndk /usr/local/lib/android/sdk/ndk-bundle
       displayName: 'Build for Android'
-  - job: MacOS_Homebrew
-    pool:
-      vmImage: 'macOS-10.14'
-    steps:
-    - script: brew install boost openssl ninja
-      displayName: Brew install dependencies
-    - script: |
-        mkdir build.debug
-        mkdir build.release
-        mkdir build.release.static
-      displayName: Make Build Directories
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.debug'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.release'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
-    - task: CMake@1
-      inputs:
-        workingDirectory: 'build.release.static'
-        cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
-    - script: |
-        cd build.debug
-        ninja
-      displayName: 'Run ninja, debug'
-    - script: |
-        cd build.debug/Release/Binaries
-        ./test_runner *test.dylib
-      displayName: 'Run tests, debug'
-    - script: |
-        cd build.release
-        ninja
-      displayName: 'Run ninja, release'
-    - script: |
-        cd build.release/Release/Binaries
-        ./test_runner *test.dylib
-      displayName: 'Run tests, release'
-    - script: |
-        cd build.release.static
-        ninja
-      displayName: 'Run ninja, release static'
+  # Homebrew is disabled for now because it apparently is deploying a Boost version that the version of xcode deployed in Pipelines cannot build.
+  # - job: MacOS_Homebrew
+  #   pool:
+  #     vmImage: 'macOS-10.14'
+  #   steps:
+  #   - script: brew install boost openssl ninja
+  #     displayName: Brew install dependencies
+  #   - script: |
+  #       mkdir build.debug
+  #       mkdir build.release
+  #       mkdir build.release.static
+  #     displayName: Make Build Directories
+  #   - task: CMake@1
+  #     inputs:
+  #       workingDirectory: 'build.debug'
+  #       cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
+  #   - task: CMake@1
+  #     inputs:
+  #       workingDirectory: 'build.release'
+  #       cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
+  #   - task: CMake@1
+  #     inputs:
+  #       workingDirectory: 'build.release.static'
+  #       cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
+  #   - script: |
+  #       cd build.debug
+  #       ninja
+  #     displayName: 'Run ninja, debug'
+  #   - script: |
+  #       cd build.debug/Release/Binaries
+  #       ./test_runner *test.dylib
+  #     displayName: 'Run tests, debug'
+  #   - script: |
+  #       cd build.release
+  #       ninja
+  #     displayName: 'Run ninja, release'
+  #   - script: |
+  #       cd build.release/Release/Binaries
+  #       ./test_runner *test.dylib
+  #     displayName: 'Run tests, release'
+  #   - script: |
+  #       cd build.release.static
+  #       ninja
+  #     displayName: 'Run ninja, release static'
   - job: MacOS_Vcpkg
     pool:
       vmImage: 'macOS-10.14'