From 9ec1a7c0ac0ee1e93520424782b85b4df99a537c Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Mon, 3 Mar 2025 14:27:43 -0800 Subject: [PATCH] update zstd build recipe to also support lz4 format --- .github/workflows/windows-artifacts.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml index 79e910b57..0394ec983 100644 --- a/.github/workflows/windows-artifacts.yml +++ b/.github/workflows/windows-artifacts.yml @@ -29,7 +29,7 @@ jobs: - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # tag=v2.27.0 with: msystem: ${{ matrix.msystem }} - install: make zlib p7zip git mingw-w64-${{matrix.env}}-gcc + install: make zlib mingw-w64-x86_64-lz4 p7zip git mingw-w64-${{matrix.env}}-gcc update: true - name: display versions @@ -42,9 +42,16 @@ jobs: git clone --depth 1 --branch v1.3.1 https://github.com/madler/zlib make -C zlib -f win32/Makefile.gcc libz.a + - name: Building lz4 to static link + run: | + git clone --depth 1 --branch v1.10.0 https://github.com/lz4/lz4 + # ensure both libraries use the same version of libxxhash + cp lib/common/xxhash.* lz4/lib + CPPFLAGS=-DXXH_NAMESPACE=LZ4_ make -C lz4/lib liblz4.a V=1 + - name: Building zstd programs run: | - CPPFLAGS=-I../zlib LDLIBS=../zlib/libz.a LDFLAGS=-static make -j allzstd V=1 + CPPFLAGS="-I../zlib -I../lz4/lib" LDLIBS="../zlib/libz.a ../lz4/lib/liblz4.a" LDFLAGS=-static make -j allzstd V=1 - name: Create artifacts run: |