summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-01-04 18:39:26 (GMT)
committerPeter Korsgaard <peter@korsgaard.com>2018-01-05 15:16:39 (GMT)
commitb7da7469de0bbefedde34c9af1ff9a832a241a58 (patch)
treeda5bd3d4f2b4626bd1f6e621a60e96fee8aeb07e
parent120a015d1cf7683236cb8bbedcbd4f7110f4c09b (diff)
downloadbuildroot-b7da7469de0bbefedde34c9af1ff9a832a241a58.tar.gz
buildroot-b7da7469de0bbefedde34c9af1ff9a832a241a58.tar.bz2
libzip: bump to version 1.4.0
Upstream switched to cmake. Add upstream patch that removes run of target binary on the host. Cc: Bartosz Golaszewski <brgl@bgdev.pl> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch40
-rw-r--r--package/libzip/libzip.hash2
-rw-r--r--package/libzip/libzip.mk7
3 files changed, 44 insertions, 5 deletions
diff --git a/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch b/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch
new file mode 100644
index 0000000..7d40111
--- /dev/null
+++ b/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch
@@ -0,0 +1,40 @@
+From e9244b207c0fc883ff84c1fc46602feb1e2b0347 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Wed, 3 Jan 2018 11:41:57 +0100
+Subject: [PATCH] Use 'cmake -E tar' to extract test data.
+
+For easier cross-compilation (Github issue #21).
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit e9244b207c0
+
+ regress/CMakeLists.txt | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
+index e2ce232c774a..3a0d4f77dcf6 100644
+--- a/regress/CMakeLists.txt
++++ b/regress/CMakeLists.txt
+@@ -51,15 +51,9 @@ ADD_CUSTOM_TARGET(cleanup
+ ADD_CUSTOM_TARGET(testinput
+ ALL
+ VERBATIM
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 0 > manyfiles.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 1 > manyfiles-133000.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 2 > manyfiles-65536.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 3 > manyfiles-zip64-modulo.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 4 > manyfiles-zip64.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 5 > manyfiles-fewer.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 6 > manyfiles-more.zip
+- COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip cat 0 > bigzero.zip
+- DEPENDS ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
++ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip
++ COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
+ )
+
+ SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
+--
+2.15.1
+
diff --git a/package/libzip/libzip.hash b/package/libzip/libzip.hash
index d100982..abfd20f 100644
--- a/package/libzip/libzip.hash
+++ b/package/libzip/libzip.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 aa936efe34911be7acac2ab07fb5c8efa53ed9bb4d44ad1fe8bff19630e0d373 libzip-1.3.0.tar.xz
+sha256 e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1 libzip-1.4.0.tar.xz
sha256 d159ae325ca0b8236c44dfd980ca99810dbcfc057b077c50dbbda1131cbd263a LICENSE
diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk
index 5ffa1ca..537aa1d 100644
--- a/package/libzip/libzip.mk
+++ b/package/libzip/libzip.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBZIP_VERSION = 1.3.0
+LIBZIP_VERSION = 1.4.0
LIBZIP_SITE = http://www.nih.at/libzip
LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz
LIBZIP_LICENSE = BSD-3-Clause
@@ -13,10 +13,9 @@ LIBZIP_INSTALL_STAGING = YES
LIBZIP_DEPENDENCIES = zlib
ifeq ($(BR2_PACKAGE_BZIP2),y)
-LIBZIP_CONF_OPTS += --with-bzip2
LIBZIP_DEPENDENCIES += bzip2
else
-LIBZIP_CONF_OPTS += --without-bzip2
+LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE
endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))