diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-02-23 14:05:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 14:05:25 +0200 |
| commit | 8bf937b012ef0d59e632aa6c7e83226e7b7d77f8 (patch) | |
| tree | 886753091911a93d02f98bade8aa880c9009ae33 /ci | |
| parent | bacf063aaeb4f739c93b056a9a6c8ae4c731cd95 (diff) | |
| parent | 96f5d4e455af3eb0c296b190727b0d76014c7534 (diff) | |
| download | meson-8bf937b012ef0d59e632aa6c7e83226e7b7d77f8.zip meson-8bf937b012ef0d59e632aa6c7e83226e7b7d77f8.tar.gz meson-8bf937b012ef0d59e632aa6c7e83226e7b7d77f8.tar.bz2 | |
Merge pull request #6602 from mensinda/depBoost
boost: System dependency rewrite
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/azure-steps.yml | 4 | ||||
| -rw-r--r-- | ci/ciimage/eoan/Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 1c861e7..fa28046 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -49,8 +49,8 @@ steps: # install boost (except for clang-cl) if ($env:arch -eq 'x86') { $boost_bitness = '32' } else { $boost_bitness = '64' } - if ($env:compiler -eq 'msvc2017') { - $boost_version = '1.64.0' ; $boost_abi_tag = '14.1' + if ($env:compiler -eq 'msvc2017' -Or $env:compiler -eq 'msvc2019' -Or $env:compiler -eq 'clang-cl') { + $boost_version = '1.72.0' ; $boost_abi_tag = '14.1' } if ($boost_version) { $boost_filename = $boost_version.Replace('.', '_') diff --git a/ci/ciimage/eoan/Dockerfile b/ci/ciimage/eoan/Dockerfile index a98662c..dcc8549 100644 --- a/ci/ciimage/eoan/Dockerfile +++ b/ci/ciimage/eoan/Dockerfile @@ -24,7 +24,7 @@ RUN sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" \ && eatmydata apt-get -y install libgcrypt20-dev \ && eatmydata apt-get -y install libgpgme-dev \ && eatmydata apt-get -y install libhdf5-dev \ -&& eatmydata apt-get -y install libboost-python-dev \ +&& eatmydata apt-get -y install libboost-python-dev libboost-regex-dev \ && eatmydata apt-get -y install libblocksruntime-dev \ && eatmydata apt-get -y install libperl-dev \ && eatmydata apt-get -y install liblapack-dev libscalapack-mpi-dev \ |