[Buildroot] [PATCH 1/2] package/libzip: use ENABLE_BZIP2

[Buildroot] [PATCH 1/2] package/libzip: use ENABLE_BZIP2

[Fabrice Fontaine]

Use ENABLE_BZIP2 option which is available since version 1.5.2 and
https://github.com/nih-at/libzip/commit/028c492c9d45ca29e2fbec79a203ba492016f15e

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libzip/libzip.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk
index 379eb2c5df..6023dbec1b 100644
--- a/package/libzip/libzip.mk
+++ b/package/libzip/libzip.mk
@@ -15,8 +15,9 @@ HOST_LIBZIP_DEPENDENCIES = host-zlib
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 LIBZIP_DEPENDENCIES += bzip2
+LIBZIP_CONF_OPTS += -DENABLE_BZIP2=ON
 else
-LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE
+LIBZIP_CONF_OPTS += -DENABLE_BZIP2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
-- 
2.27.0

[Buildroot] [PATCH 2/2] package/libzip: add mbedtls optional dependency

[Fabrice Fontaine]

mbedtls is available (and enabled by default) since version 1.5.2 and
https://github.com/nih-at/libzip/commit/8e01a4fe8fa830c973b6a00f0da1e8b01789529a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libzip/libzip.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/libzip/libzip.mk b/package/libzip/libzip.mk
index 6023dbec1b..9d64db32fa 100644
--- a/package/libzip/libzip.mk
+++ b/package/libzip/libzip.mk
@@ -27,6 +27,13 @@ else
 LIBZIP_CONF_OPTS += -DENABLE_GNUTLS=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+LIBZIP_DEPENDENCIES += mbedtls
+LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=ON
+else
+LIBZIP_CONF_OPTS += -DENABLE_MBEDTLS=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBZIP_DEPENDENCIES += openssl
 LIBZIP_CONF_OPTS += -DENABLE_OPENSSL=ON
-- 
2.27.0

[Buildroot] [PATCH 1/2] package/libzip: use ENABLE_BZIP2

[Thomas Petazzoni]

On Mon, 20 Jul 2020 22:42:06 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Use ENABLE_BZIP2 option which is available since version 1.5.2 and
> https://github.com/nih-at/libzip/commit/028c492c9d45ca29e2fbec79a203ba492016f15e
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libzip/libzip.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com