From ec2ab620f8a00a2e01a7f186f5e228c7e2ac278e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Aug 2022 19:30:09 +0200 Subject: [PATCH] [snappy] fix clang-cl builds (#26057) * snappy fix clang-cl builds * v db * CI Retriger --- ports/snappy/fix_clang-cl_build.patch | 13 +++++++++++++ ports/snappy/portfile.cmake | 2 ++ ports/snappy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/snappy.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/snappy/fix_clang-cl_build.patch diff --git a/ports/snappy/fix_clang-cl_build.patch b/ports/snappy/fix_clang-cl_build.patch new file mode 100644 index 0000000000..b981e3076a --- /dev/null +++ b/ports/snappy/fix_clang-cl_build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 672561e62..b6930b834 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ if(NOT CMAKE_CXX_STANDARD) + endif(NOT CMAKE_CXX_STANDARD) + + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + # Use the highest warning level for Visual Studio. + set(CMAKE_CXX_WARNING_LEVEL 4) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 45b8c706db..6660b86efd 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1.1.9 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 HEAD_REF master + PATCHES + fix_clang-cl_build.patch ) vcpkg_cmake_configure( diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json index 593b023434..ecc8a2aea5 100644 --- a/ports/snappy/vcpkg.json +++ b/ports/snappy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "snappy", "version": "1.1.9", - "port-version": 1, + "port-version": 2, "description": "A fast compressor/decompressor.", "homepage": "https://github.com/google/snappy", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f9580d9264..f9a9391151 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6674,7 +6674,7 @@ }, "snappy": { "baseline": "1.1.9", - "port-version": 1 + "port-version": 2 }, "sndfile": { "baseline": "0", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index 5e6b9bad19..0ee914f721 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7122115f0f35f7f90f7a7adc1d15a4b6f7af5315", + "version": "1.1.9", + "port-version": 2 + }, { "git-tree": "c92c17d378451a07e9cc974fa31893d1cae61b66", "version": "1.1.9",