Skip to content

Commit 643dc60

Browse files
authored
Update boost-for-android for Android NDK r20 and disable macOS Homebrew. (#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.
1 parent 951e269 commit 643dc60

File tree

2 files changed

+45
-44
lines changed

2 files changed

+45
-44
lines changed

Build_android/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ if [ "${DO_OPENSSL}" == "1" ]; then (
155155
if [ "${DO_BOOST}" == "1" ]; then (
156156
if [ ! -d 'Boost-for-Android' ]; then git clone https://github.com/moritz-wundke/Boost-for-Android; fi
157157
cd Boost-for-Android
158-
git checkout b1e2cb397d3ec573f1cfdf4f4d965766204c53f1
158+
git checkout aed656a97fb3af7322fd2c3da5995a2d09d87d4b
159159
PATH="$PATH:$NDK_DIR" \
160160
CXXFLAGS="-std=gnu++11" \
161161
./build-android.sh \

azure-pipelines.yml

+44-43
Original file line numberDiff line numberDiff line change
@@ -222,49 +222,50 @@ jobs:
222222
export NCPU=2
223223
../configure.sh --ndk /usr/local/lib/android/sdk/ndk-bundle
224224
displayName: 'Build for Android'
225-
- job: MacOS_Homebrew
226-
pool:
227-
vmImage: 'macOS-10.14'
228-
steps:
229-
- script: brew install boost openssl ninja
230-
displayName: Brew install dependencies
231-
- script: |
232-
mkdir build.debug
233-
mkdir build.release
234-
mkdir build.release.static
235-
displayName: Make Build Directories
236-
- task: CMake@1
237-
inputs:
238-
workingDirectory: 'build.debug'
239-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
240-
- task: CMake@1
241-
inputs:
242-
workingDirectory: 'build.release'
243-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
244-
- task: CMake@1
245-
inputs:
246-
workingDirectory: 'build.release.static'
247-
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
248-
- script: |
249-
cd build.debug
250-
ninja
251-
displayName: 'Run ninja, debug'
252-
- script: |
253-
cd build.debug/Release/Binaries
254-
./test_runner *test.dylib
255-
displayName: 'Run tests, debug'
256-
- script: |
257-
cd build.release
258-
ninja
259-
displayName: 'Run ninja, release'
260-
- script: |
261-
cd build.release/Release/Binaries
262-
./test_runner *test.dylib
263-
displayName: 'Run tests, release'
264-
- script: |
265-
cd build.release.static
266-
ninja
267-
displayName: 'Run ninja, release static'
225+
# Homebrew is disabled for now because it apparently is deploying a Boost version that the version of xcode deployed in Pipelines cannot build.
226+
# - job: MacOS_Homebrew
227+
# pool:
228+
# vmImage: 'macOS-10.14'
229+
# steps:
230+
# - script: brew install boost openssl ninja
231+
# displayName: Brew install dependencies
232+
# - script: |
233+
# mkdir build.debug
234+
# mkdir build.release
235+
# mkdir build.release.static
236+
# displayName: Make Build Directories
237+
# - task: CMake@1
238+
# inputs:
239+
# workingDirectory: 'build.debug'
240+
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Debug ..'
241+
# - task: CMake@1
242+
# inputs:
243+
# workingDirectory: 'build.release'
244+
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
245+
# - task: CMake@1
246+
# inputs:
247+
# workingDirectory: 'build.release.static'
248+
# cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
249+
# - script: |
250+
# cd build.debug
251+
# ninja
252+
# displayName: 'Run ninja, debug'
253+
# - script: |
254+
# cd build.debug/Release/Binaries
255+
# ./test_runner *test.dylib
256+
# displayName: 'Run tests, debug'
257+
# - script: |
258+
# cd build.release
259+
# ninja
260+
# displayName: 'Run ninja, release'
261+
# - script: |
262+
# cd build.release/Release/Binaries
263+
# ./test_runner *test.dylib
264+
# displayName: 'Run tests, release'
265+
# - script: |
266+
# cd build.release.static
267+
# ninja
268+
# displayName: 'Run ninja, release static'
268269
- job: MacOS_Vcpkg
269270
pool:
270271
vmImage: 'macOS-10.14'

0 commit comments

Comments
 (0)