Skip to content

Commit

Permalink
depends: bump libzip to 1.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
div72 committed Sep 23, 2024
1 parent 86fa58d commit 8bdb351
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 58 deletions.
47 changes: 18 additions & 29 deletions depends/packages/libzip.mk
Original file line number Diff line number Diff line change
@@ -1,40 +1,29 @@
package=libzip
$(package)_version=1.3.2
$(package)_version=1.10.1
$(package)_download_path=https://libzip.org/download/
$(package)_file_name=$(package)-$($(package)_version).tar.gz
$(package)_sha256_hash=ab4c34eb6c3a08b678cd0f2450a6c57a13e9618b1ba34ee45d00eb5327316457
$(package)_dependencies=zlib bzip2
$(package)_patches=nonrandomopentest.c.patch compat.h.patch

$(package)_sha256_hash=9669ae5dfe3ac5b3897536dc8466a874c8cf2c0e3b1fdd08d75b273884299363
$(package)_dependencies=zlib

define $(package)_set_vars
$(package)_build_opts= CC="$($(package)_cc)"
$(package)_build_opts+=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC"
$(package)_build_opts+=RANLIB="$($(package)_ranlib)"
$(package)_build_opts+=AR="$($(package)_ar)"
$(package)_cxxflags_aarch64_linux = $(GCCFLAGS)
$(package)_cflags_aarch64_linux = $(GCCFLAGS)
$(package)_cxxflags_arm_linux = $(GCCFLAGS)
$(package)_cflags_arm_linux = $(GCCFLAGS)
endef

ifeq ($(host),i686-pc-linux-gnu)
i686_cflag="$($(package)_cflags) $($(package)_cppflags) -fPIC -m32"
else
i686_cflag="$($(package)_cflags) $($(package)_cppflags) -fPIC"
endif


define $(package)_preprocess_cmds
sed -i.old 's/\# ifdef _WIN32/\# if defined _WIN32 \&\& defined ZIP_DLL/' lib/zip.h && \
patch -p1 < $($(package)_patch_dir)/nonrandomopentest.c.patch && \
patch -p1 < $($(package)_patch_dir)/compat.h.patch
$(package)_config_opts=-DENABLE_COMMONCRYPTO=OFF
$(package)_config_opts+=-DENABLE_GNUTLS=OFF
$(package)_config_opts+=-DENABLE_MBEDTLS=OFF
$(package)_config_opts+=-DENABLE_OPENSSL=OFF
$(package)_config_opts+=-DENABLE_WINDOWS_CRYPTO=OFF
$(package)_config_opts+=-DENABLE_BZIP2=OFF
$(package)_config_opts+=-DENABLE_LZMA=OFF
$(package)_config_opts+=-DENABLE_ZSTD=OFF
$(package)_config_opts+=-DENABLE_FDOPEN=OFF
$(package)_config_opts+=-DBUILD_TOOLS=OFF
$(package)_config_opts+=-DBUILD_REGRESS=OFF
$(package)_config_opts+=-DBUILD_OSSFUZZ=OFF
$(package)_config_opts+=-DBUILD_EXAMPLES=OFF
$(package)_config_opts+=-DBUILD_DOC=OFF
endef

define $(package)_config_cmds
$($(package)_build_opts) CFLAGS=$(i686_cflag) ./configure --host=$(host) \
--prefix=$(host_prefix) --with-zlib=$(host_prefix) --with-bzip2=$(host_prefix) \
--with-pic --enable-static --enable-shared=no --libdir=$($($(package)_type)_prefix)/lib
$($(package)_cmake) -S . -B . -DBUILD_SHARED_LIBS=OFF -DCMAKE_LIBRARY_PATH=$(host_prefix)
endef

define $(package)_build_cmds
Expand Down
15 changes: 0 additions & 15 deletions depends/patches/libzip/compat.h.patch

This file was deleted.

14 changes: 0 additions & 14 deletions depends/patches/libzip/nonrandomopentest.c.patch

This file was deleted.

0 comments on commit 8bdb351

Please sign in to comment.