[zstd] Removing de-duplication of cmake flags (#13454)

2020-10-27 04:59:39 +01:00 · 2020-10-27 04:59:39 +01:00 · c7db4c3498
parent c31cfd3c81
commit c7db4c3498
3 changed files with 14 additions and 1 deletions
--- a/ports/zstd/0002-crosscompile-windows.patch
+++ b/ports/zstd/0002-crosscompile-windows.patch
@ -0,0 +1,12 @@
+diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+index 7adca875..8835d1c6 100644
+--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake	2019-11-04 17:54:32.000000000 +0000
+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake	2020-09-09 20:54:13.817515706 +0000
+@@ -52,7 +52,6 @@
+              CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+         if( ${flag_var} )
+             separate_arguments(${flag_var})
+-            list(REMOVE_DUPLICATES ${flag_var})
+             string(REPLACE ";" " " ${flag_var} "${${flag_var}}")
+         endif()
+     endforeach ()
--- a/ports/zstd/CONTROL
+++ b/ports/zstd/CONTROL
@ -1,5 +1,5 @@
 Source: zstd
 Version: 1.4.4
-Port-Version: 2
+Port-Version: 3
 Description: Zstandard - Fast real-time compression algorithm
 Homepage: https://facebook.github.io/zstd/
--- a/ports/zstd/portfile.cmake
+++ b/ports/zstd/portfile.cmake
@ -6,6 +6,7 @@ vcpkg_from_github(
    HEAD_REF dev
    PATCHES
      0001-export-zstd-config.patch
+      0002-crosscompile-windows.patch
 )

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")