[PATCHv2 1/3] libzip: Allow support for bzip2 to be disabled

[PATCHv2 1/3] libzip: Allow support for bzip2 to be disabled

[Peter Kjellerstedt]

Enable it by default.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

PATCHv2: No changes.

 meta/recipes-extended/libzip/libzip_1.12.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/libzip/libzip_1.12.1.bb b/meta/recipes-extended/libzip/libzip_1.12.1.bb
index 95bac993f9..bfa23b6d9b 100644
--- a/meta/recipes-extended/libzip/libzip_1.12.1.bb
+++ b/meta/recipes-extended/libzip/libzip_1.12.1.bb
@@ -10,15 +10,16 @@ SECTION = "libs"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e6fcea978dc627f41e0bada0de889ec4"
 
-DEPENDS = "zlib bzip2"
+DEPENDS = "zlib"
 
 SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c40062022a1963c80573d48f6070792297cecd7c6bffe3aefcac0d8b9bee8913"
 
 inherit cmake
 
-PACKAGECONFIG ?= "ssl lzma tools examples"
+PACKAGECONFIG ?= "bzip2 ssl lzma tools examples"
 
+PACKAGECONFIG[bzip2] = "-DENABLE_BZIP2=ON,-DENABLE_BZIP2=OFF,bzip2"
 PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl"
 PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle"
 PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz"

[PATCHv2 2/3] libzip: Inherit lib_package to package the tools separately

[Peter Kjellerstedt]

This also means the tools are no longer installed by default.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

PATCHv2: The libzip package no longer recommends libzip-bin.

 meta/recipes-extended/libzip/libzip_1.12.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/libzip/libzip_1.12.1.bb b/meta/recipes-extended/libzip/libzip_1.12.1.bb
index bfa23b6d9b..0e80dbb00e 100644
--- a/meta/recipes-extended/libzip/libzip_1.12.1.bb
+++ b/meta/recipes-extended/libzip/libzip_1.12.1.bb
@@ -15,7 +15,7 @@ DEPENDS = "zlib"
 SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz"
 SRC_URI[sha256sum] = "c40062022a1963c80573d48f6070792297cecd7c6bffe3aefcac0d8b9bee8913"
 
-inherit cmake
+inherit cmake lib_package
 
 PACKAGECONFIG ?= "bzip2 ssl lzma tools examples"
 

[PATCHv2 3/3] libzip: Do not build the examples by default

[Peter Kjellerstedt]

It just wastes resources.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

PATCHv2: No changes.

 meta/recipes-extended/libzip/libzip_1.12.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-extended/libzip/libzip_1.12.1.bb b/meta/recipes-extended/libzip/libzip_1.12.1.bb
index 0e80dbb00e..8bd01a1c0c 100644
--- a/meta/recipes-extended/libzip/libzip_1.12.1.bb
+++ b/meta/recipes-extended/libzip/libzip_1.12.1.bb
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "c40062022a1963c80573d48f6070792297cecd7c6bffe3aefcac0d8b9b
 
 inherit cmake lib_package
 
-PACKAGECONFIG ?= "bzip2 ssl lzma tools examples"
+PACKAGECONFIG ?= "bzip2 ssl lzma tools"
 
 PACKAGECONFIG[bzip2] = "-DENABLE_BZIP2=ON,-DENABLE_BZIP2=OFF,bzip2"
 PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl"