diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 66c39cacb..838958da7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1140,19 +1140,15 @@ mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip
mozjpeg:x64-windows-static = skip
mozjpeg:x86-windows = skip
-mpir:arm64-windows=fail
-mpir:arm-uwp=fail
-mpir:x64-uwp=fail
-# Building package gmp[core]:x64-linux... done
-# Installing package gmp[core]:x64-linux...
-# The following files are already installed in /mnt/1/s/installed/x64-linux and are in conflict with gmp:x64-linux
-#
-# Installed by mpir:x64-linux
-# debug/lib/libgmp.a
-# debug/lib/libgmp.la
-# include/gmp.h
-# lib/libgmp.a
-# lib/libgmp.la
+# mpir conflicts with gmp
+# see https://github.com/microsoft/vcpkg/issues/11756
+mpir:x86-windows=skip
+mpir:x64-windows=skip
+mpir:x64-windows-static=skip
+mpir:arm64-windows=skip
+mpir:arm-uwp=skip
+mpir:x64-uwp=skip
+mpir:x64-osx=skip
mpir:x64-linux=skip
#Conflicts with angle and qt-5base
ms-angle:arm64-windows = skip
@@ -2035,4 +2031,4 @@ ctp:x64-windows=skip ctp:x64-windows-static=skip
ctp:x86-windows=skip
protozero:arm-uwp=fail
-protozero:x64-uwp=fail
\ No newline at end of file +protozero:x64-uwp=fail
|