Skip to content

[zstd] Fix emscripten #30174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 1 commit into from
Mar 15, 2023
Merged

[zstd] Fix emscripten #30174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/zstd/emscripten.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion ports/zstd/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/zstd
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions ports/zstd/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8674,7 +8674,7 @@
},
"zstd": {
"baseline": "1.5.4",
"port-version": 0
"port-version": 1
},
"zstr": {
"baseline": "1.0.7",
Expand Down
5 changes: 5 additions & 0 deletions versions/z-/zstd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4b61cbe1e314aa678d7cbf37a24b59e37694f4a6",
"version": "1.5.4",
"port-version": 1
},
{
"git-tree": "16ff2b227a85c9f483480a6bb6d5eb0103ceee44",
"version": "1.5.4",
Expand Down