Skip to content

Commit f72ec65

Browse files
authored
(#14396) zstd: fix strange performance issue
* zstd: fix strange performance and scalability issues * zstd: fix strange performance and scalability issues
1 parent bbfd403 commit f72ec65

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

recipes/zstd/all/conandata.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,21 @@ sources:
3535
patches:
3636
"1.5.2":
3737
- patch_file: "patches/1.5.2-cmake-remove-asm-except-x86_64.patch"
38+
- patch_file: "patches/1.5.0-remove-explicit-standard-setting.patch"
39+
patch_description: "fix strange performance and scalability issues"
40+
patch_type: "backport"
41+
patch_source: "https://github.com/facebook/zstd/pull/3167"
3842
"1.5.1":
3943
- patch_file: "patches/1.5.1-cmake-remove-asm-except-x86_64.patch"
44+
- patch_file: "patches/1.5.0-remove-explicit-standard-setting.patch"
45+
patch_description: "fix strange performance and scalability issues"
46+
patch_type: "backport"
47+
patch_source: "https://github.com/facebook/zstd/pull/3167"
48+
"1.5.0":
49+
- patch_file: "patches/1.5.0-remove-explicit-standard-setting.patch"
50+
patch_description: "fix strange performance and scalability issues"
51+
patch_type: "backport"
52+
patch_source: "https://github.com/facebook/zstd/pull/3167"
4053
"1.4.5":
4154
- patch_file: "patches/1.4.5-cmake-install-dll.patch"
4255
"1.3.5":
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
2+
index e23b9d6..8d04458 100644
3+
--- a/a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
4+
+++ b/b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
5+
@@ -22,10 +22,12 @@ endfunction()
6+
7+
macro(ADD_ZSTD_COMPILATION_FLAGS)
8+
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" OR MINGW) #Not only UNIX but also WIN32 for MinGW
9+
- #Set c++11 by default
10+
- EnableCompilerFlag("-std=c++11" false true)
11+
- #Set c99 by default
12+
- EnableCompilerFlag("-std=c99" true false)
13+
+ # It's possible to select the exact standard used for compilation.
14+
+ # It's not necessary, but can be employed for specific purposes.
15+
+ # Note that zstd source code is compatible with both C++98 and above
16+
+ # and C-gnu90 (c90 + long long + variadic macros ) and above
17+
+ # EnableCompilerFlag("-std=c++11" false true) # Set C++ compilation to c++11 standard
18+
+ # EnableCompilerFlag("-std=c99" true false) # Set C compiation to c99 standard
19+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND MSVC)
20+
# clang-cl normally maps -Wall to -Weverything.
21+
EnableCompilerFlag("/clang:-Wall" true true)

0 commit comments

Comments
 (0)