From 2018406edbe323bcf13a19cc131a08bc3eca18d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 18 Nov 2020 10:49:25 -0800 Subject: [PATCH] [vcpkg baseline] Clean up baseline, use Keyword Supports (#14246) --- ports/atk/CONTROL | 1 + ports/atlmfc/CONTROL | 1 + ports/aubio/CONTROL | 1 + ports/avro-cpp/CONTROL | 1 + ports/aws-c-common/CONTROL | 1 + ports/aws-checksums/CONTROL | 3 +- ports/aws-lambda-cpp/CONTROL | 1 + ports/azure-kinect-sensor-sdk/CONTROL | 1 + ports/bde/CONTROL | 1 + ports/benchmark/CONTROL | 2 +- ports/bitserializer/CONTROL | 1 + scripts/ci.baseline.txt | 46 +-------------------------- 12 files changed, 13 insertions(+), 47 deletions(-) diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index 0fa67bfc544..bcfc01d1655 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -3,3 +3,4 @@ Version: 2.24.0-5 Homepage: https://developer.gnome.org/atk/ Description: GNOME Accessibility Toolkit Build-Depends: glib, gettext +Supports: !(osx|arm) \ No newline at end of file diff --git a/ports/atlmfc/CONTROL b/ports/atlmfc/CONTROL index aff5c97aa6e..a5af713fcbf 100644 --- a/ports/atlmfc/CONTROL +++ b/ports/atlmfc/CONTROL @@ -1,3 +1,4 @@ Source: atlmfc Version: 0 Description: a stub package that ensures VS has ATL/MFC installed. +Supports: windows \ No newline at end of file diff --git a/ports/aubio/CONTROL b/ports/aubio/CONTROL index de5eafe694f..211dad0793e 100644 --- a/ports/aubio/CONTROL +++ b/ports/aubio/CONTROL @@ -4,3 +4,4 @@ Port-Version: 3 Homepage: https://github.com/aubio/aubio Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio. Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma +Supports: windows \ No newline at end of file diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL index 0f75d7e24cd..85518d7577f 100644 --- a/ports/avro-cpp/CONTROL +++ b/ports/avro-cpp/CONTROL @@ -3,6 +3,7 @@ Version: 1.9.2 Homepage: https://github.com/apache/avro Description: Apache Avro is a data serialization system Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd +Supports: !(windows&static) Feature: snappy Build-Depends: snappy diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL index cc91c44f48b..2439c0c655e 100644 --- a/ports/aws-c-common/CONTROL +++ b/ports/aws-c-common/CONTROL @@ -2,3 +2,4 @@ Source: aws-c-common Version: 0.4.56 Homepage: https://github.com/awslabs/aws-c-common Description: AWS common library for C +Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL index 79a420c09b8..d9b9e53c92f 100644 --- a/ports/aws-checksums/CONTROL +++ b/ports/aws-checksums/CONTROL @@ -1,4 +1,5 @@ Source: aws-checksums Version: 0.1.9 Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. -Build-Depends: aws-c-common \ No newline at end of file +Build-Depends: aws-c-common +Supports: !(arm&windows) \ No newline at end of file diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL index ca3f5aa7618..a5533ba8bf6 100644 --- a/ports/aws-lambda-cpp/CONTROL +++ b/ports/aws-lambda-cpp/CONTROL @@ -2,3 +2,4 @@ Source: aws-lambda-cpp Version: 0.2.6 Build-Depends: curl Description: C++ Runtime for AWS Lambda. +Supports: linux \ No newline at end of file diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL index 81b05d3ac9d..f6bf9ae0cad 100644 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ b/ports/azure-kinect-sensor-sdk/CONTROL @@ -4,6 +4,7 @@ Port-Version: 6 Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device. Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv +Supports: windows Feature: docs Description: Build K4A doxygen documentation. diff --git a/ports/bde/CONTROL b/ports/bde/CONTROL index 10accadc9f8..b31c0e2eb50 100644 --- a/ports/bde/CONTROL +++ b/ports/bde/CONTROL @@ -2,3 +2,4 @@ Source: bde Version: 3.2.0.0 Port-Version: 2 Description: Basic Development Environment - a set of foundational C++ libraries used at Bloomberg. +Supports: !windows \ No newline at end of file diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL index 5a6af55955e..9a761838549 100644 --- a/ports/benchmark/CONTROL +++ b/ports/benchmark/CONTROL @@ -2,4 +2,4 @@ Source: benchmark Version: 1.5.2 Homepage: https://github.com/google/benchmark Description: A library to support the benchmarking of functions, similar to unit-tests. -Supports: !uwp \ No newline at end of file +Supports: !(arm|uwp) diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL index 63444a871ba..bc33cc5525a 100644 --- a/ports/bitserializer/CONTROL +++ b/ports/bitserializer/CONTROL @@ -3,6 +3,7 @@ Version: 0.10 Description: Core part of C++ 17 library for serialization to JSON, XML, YAML Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive +Supports: !(arm|osx) Feature: cpprestjson-archive Build-Depends: cpprestsdk diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 00c68febaee..9e2161c49a3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -30,53 +30,9 @@ # Add new items alphabetically # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail - -atk:x64-osx=fail -atk:arm64-windows=fail -atlmfc:x64-linux=fail -atlmfc:x64-osx=fail -aubio:x64-linux=fail -aubio:x64-osx=fail -avro-c:arm-uwp=fail -avro-c:x64-osx=fail -avro-c:x64-uwp=fail -avro-cpp:x64-windows-static=fail -aws-c-common:arm64-windows=fail -aws-c-common:arm-uwp=fail -aws-c-common:x64-uwp=fail -aws-checksums:arm64-windows=fail -aws-lambda-cpp:arm64-windows=fail -aws-lambda-cpp:arm-uwp=fail -aws-lambda-cpp:x64-uwp=fail -aws-lambda-cpp:x64-windows=fail -aws-lambda-cpp:x64-windows-static=fail -aws-lambda-cpp:x86-windows=fail -aws-lambda-cpp:x64-osx=fail -azure-c-shared-utility:arm-uwp=fail -azure-c-shared-utility:x64-uwp=fail -azure-kinect-sensor-sdk:x64-linux=fail -azure-kinect-sensor-sdk:x64-osx=fail # Requires ATL for ARM64 to be installed in CI azure-storage-cpp:arm64-windows=fail -bde:arm64-windows=fail -bde:arm-uwp=fail -bde:x64-uwp=fail -bde:x64-windows=fail -bde:x64-windows-static=fail -bde:x86-windows=fail -benchmark:arm64-windows=fail -benchmark:arm-uwp=fail -benchmark:x64-uwp=fail -berkeleydb:arm-uwp=fail -berkeleydb:x64-linux=fail -berkeleydb:x64-osx=fail -berkeleydb:x64-uwp=fail -bitserializer-rapidyaml:arm-uwp=skip -bitserializer-rapidyaml:arm64-windows=skip -bitserializer-rapidyaml:x64-osx=skip -bitserializer:arm-uwp=skip -bitserializer:arm64-windows=skip -bitserializer:x64-osx=skip + blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail