[zstd] Fix emscripten (#30174)

This commit is contained in:
Kai Pastor 2023-03-15 18:36:47 +01:00 committed by GitHub
parent f880a3718c
commit c4aa1a2435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 2 deletions

View File

@ -0,0 +1,14 @@
diff --git a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
index 0265349..1807d6e 100644
--- a/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
+++ b/build/cmake/CMakeModules/AddZstdCompilationFlags.cmake
@@ -54,7 +54,9 @@ macro(ADD_ZSTD_COMPILATION_FLAGS)
endif ()
# Add noexecstack flags
# LDFLAGS
+ if(NOT EMSCRIPTEN)
EnableCompilerFlag("-z noexecstack" false false true)
+ endif()
# CFLAGS & CXXFLAGS
EnableCompilerFlag("-Qunused-arguments" true true false)
EnableCompilerFlag("-Wa,--noexecstack" true true false)

View File

@ -1,4 +1,3 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/zstd
@ -7,6 +6,7 @@ vcpkg_from_github(
HEAD_REF dev
PATCHES
no-static-suffix.patch
emscripten.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC)

View File

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

View File

@ -8674,7 +8674,7 @@
},
"zstd": {
"baseline": "1.5.4",
"port-version": 0
"port-version": 1
},
"zstr": {
"baseline": "1.0.7",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4b61cbe1e314aa678d7cbf37a24b59e37694f4a6",
"version": "1.5.4",
"port-version": 1
},
{
"git-tree": "16ff2b227a85c9f483480a6bb6d5eb0103ceee44",
"version": "1.5.4",