Skip to content

Update libzstd builder #33

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update libzstd builder #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cfd9a2
Fix libzstd builder to produce shippable artifacts
cmb69 Dec 4, 2024
3a1867b
Reduce context of libzstd.patch
cmb69 Dec 4, 2024
76d9c62
Set missing include path for RC compilation
cmb69 Dec 4, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/libzstd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ jobs:
- name: Patch libzstd
run: cd libzstd && git apply --ignore-whitespace ..\winlib-builder\patches\libzstd.patch
- name: Configure libzstd
run: cd libzstd\build\cmake && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} .
run: cd libzstd\build\cmake && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCMAKE_SYSTEM_VERSION=${{steps.virtuals.outputs.winsdk}} -DZSTD_BUILD_PROGRAMS=OFF -DCMAKE_RC_FLAGS=-I${{github.workspace}}\libzstd\lib .
- name: Build libzstd
run: cd libzstd\build\cmake && cmake --build . --config RelWithDebInfo
- name: Install libzstd
run: |
cd libzstd\build\cmake
cmake --install . --config RelWithDebInfo --prefix ..\..\..\install
xcopy lib\RelWithDebInfo\libzstd.pdb ..\..\..\install\bin\*
xcopy lib\RelWithDebInfo\libzstd_a.pdb ..\..\..\install\lib\*
cd ..\..
copy COPYING ..\install
copy LICENSE ..\install
Expand Down
11 changes: 2 additions & 9 deletions patches/libzstd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
build/cmake/lib/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 088c8760..a63b5c81 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -121,7 +121,7 @@ if (ZSTD_BUILD_SHARED)
set_target_properties(
@@ -122,5 +122,5 @@ if (ZSTD_BUILD_SHARED)
libzstd_shared
PROPERTIES
- OUTPUT_NAME zstd
+ OUTPUT_NAME libzstd
VERSION ${zstd_VERSION_MAJOR}.${zstd_VERSION_MINOR}.${zstd_VERSION_PATCH}
SOVERSION ${zstd_VERSION_MAJOR})
endif ()
@@ -131,7 +131,7 @@ if (ZSTD_BUILD_STATIC)
libzstd_static
@@ -132,5 +132,5 @@ if (ZSTD_BUILD_STATIC)
PROPERTIES
POSITION_INDEPENDENT_CODE On
- OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
+ OUTPUT_NAME libzstd_a)
endif ()

if (UNIX OR MINGW)