Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mpir] Baseline-skip on all platforms due to conflict with gmp. #11759

Merged
merged 1 commit into from
Jun 4, 2020
Merged

[mpir] Baseline-skip on all platforms due to conflict with gmp. #11759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
protozero:x64-uwp=fail