Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ stages:
sudo apt -f -u install ninja-build gcc-multilib lib32z1-dev zlib1g-dev libssl-dev libssl1.1:i386 libssl-dev:i386 libc-dev:i386 libc6-dev-i386 -y
git submodule update --init --recursive
displayName: 'Install Tools'
- bash: |
patch --verbose -d external/libzip -p1 -l < libzip-static.patch
displayName: 'Apply Patch'
- bash: |
./build_native
displayName: 'Build Linux x64'
Expand Down
2 changes: 1 addition & 1 deletion build_native
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ cd build/$HOSTOS/$ARCH
if [ -e "$TOOLCHAIN_FILE" ]; then
ARGS=-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE
fi
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DBUILD_SHARED_LIBS=ON $ARGS ../../../external/libzip
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DBUILD_SHARED_LIBS=ON -DOPENSSL_USE_STATIC_LIBS=ON -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF $ARGS ../../../external/libzip
ninja -v
cd ../../..
4 changes: 2 additions & 2 deletions build_windows
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash -e
install -d -m 755 build/Windows/64
cd build/Windows/64
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_TOOLCHAIN_FILE=../../../mingw-64.cmake -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DZLIB_ROOT=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32 -DZLIB_LIBRARY=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32/lib/libz.a -DZLIB_INCLUDE_DIR=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32/include ../../../external/libzip
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DCMAKE_TOOLCHAIN_FILE=../../../mingw-64.cmake -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DZLIB_ROOT=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32 -DZLIB_LIBRARY=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32/lib/libz.a -DZLIB_INCLUDE_DIR=/usr/local/opt/mingw-zlib/usr/x86_64-w64-mingw32/include ../../../external/libzip
ninja
cd ../../..

install -d -m 755 build/Windows/32
cd build/Windows/32
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_TOOLCHAIN_FILE=../../../mingw-32.cmake -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DZLIB_ROOT=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32 -DZLIB_LIBRARY=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32/lib/libz.a -DZLIB_INCLUDE_DIR=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32/include ../../../external/libzip
cmake -GNinja -DCMAKE_MAKE_PROGRAM=ninja -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DCMAKE_TOOLCHAIN_FILE=../../../mingw-32.cmake -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DZLIB_ROOT=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32 -DZLIB_LIBRARY=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32/lib/libz.a -DZLIB_INCLUDE_DIR=/usr/local/opt/mingw-zlib/usr/i686-w64-mingw32/include ../../../external/libzip
ninja
cd ../../..
13 changes: 13 additions & 0 deletions libzip-static.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 92c4becc..e58b7db3 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -211,7 +211,7 @@ ENDIF()

ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES})
SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5)
-TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY})
+TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY} OpenSSL::Crypto -ldl -pthread)
INSTALL(TARGETS zip
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}