[zstd] Fix clang-cl flags (#29992)

microsoft · Apr 13, 2023 · 2c84b1e · 2c84b1e
1 parent c2f29e5
commit 2c84b1e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 17 deletions.
diff --git a/ports/zstd/emscripten.patch b/ports/zstd/emscripten.patch
diff --git a/ports/zstd/fix-emscripten-and-clang-cl.patch b/ports/zstd/fix-emscripten-and-clang-cl.patch
@@ -0,0 +1,31 @@
+diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+index 0265349..4a50a67 100644
+--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
++++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+@@ -54,10 +54,22 @@ macro(ADD_ZSTD_COMPILATION_FLAGS)
+         endif ()
+         # Add noexecstack flags
+         # LDFLAGS
+-        EnableCompilerFlag("-z noexecstack" false false true)
+-        # CFLAGS & CXXFLAGS
+-        EnableCompilerFlag("-Qunused-arguments" true true false)
+-        EnableCompilerFlag("-Wa,--noexecstack" true true false)
++        if(MSVC)
++            # UNICODE SUPPORT
++            EnableCompilerFlag("/D_UNICODE" true true false)
++            EnableCompilerFlag("/DUNICODE" true true false)
++            # Enable asserts in Debug mode
++            if (CMAKE_BUILD_TYPE MATCHES "Debug")
++                EnableCompilerFlag("/DDEBUGLEVEL=1" true true false)
++            endif ()
++        else()
++        if(NOT EMSCRIPTEN)
++            EnableCompilerFlag("-z noexecstack" false false true)
++        endif()
++            # CFLAGS & CXXFLAGS
++            EnableCompilerFlag("-Qunused-arguments" true true false)
++            EnableCompilerFlag("-Wa,--noexecstack" true true false)
++        endif()
+     elseif (MSVC) # Add specific compilation flags for Windows Visual
+
+         set(ACTIVATE_MULTITHREADED_COMPILATION "ON" CACHE BOOL "activate multi-threaded compilation (/MP flag)")
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     HEAD_REF dev
     PATCHES
         no-static-suffix.patch
-        emscripten.patch
+        fix-emscripten-and-clang-cl.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC)

diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "zstd",
   "version": "1.5.4",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Zstandard - Fast real-time compression algorithm",
   "homepage": "https://facebook.github.io/zstd/",
   "license": "BSD-3-Clause OR GPL-2.0-only",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8750,7 +8750,7 @@
     },
     "zstd": {
       "baseline": "1.5.4",
-      "port-version": 1
+      "port-version": 2
     },
     "zstr": {
       "baseline": "1.0.7",

diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fcc4fe2738d903bc347d20d2d4c836699e273509",
+      "version": "1.5.4",
+      "port-version": 2
+    },
     {
       "git-tree": "4b61cbe1e314aa678d7cbf37a24b59e37694f4a6",
       "version": "1.5.4",