libzip: Upgrade to 1.8.0
PATCH 1/5 libzip: Upgrade to 1.8.0
Add packageconfigs for various features keep them disabled except ssl lzma tools examples
Signed-off-by Khem Raj <[email protected]>
--- .../recipes-extended/libzip/libzip_1.7.3.bb | 18 -------------- .../recipes-extended/libzip/libzip_1.8.0.bb | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) delete mode 100644 meta-oe/recipes-extended/libzip/libzip_1.7.3.bb create mode 100644 meta-oe/recipes-extended/libzip/libzip_1.8.0.bb
meta-oe/recipes-extended/libzip/libzip_1.7.3.bb deleted +0 -18
@@ -1,18 +0,0 @@ -DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." -HOMEPAGE = "https://libzip.org/" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" - -DEPENDS = "zlib bzip2" - -PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" -PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" - -PACKAGECONFIG ?= "ssl lzma" - -inherit cmake - -SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" - -SRC_URI[sha256sum] = "a60473ffdb7b4260c08bfa19c2ccea0438edac11193c3afbbb1f17fbcf6c6132"
meta-oe/recipes-extended/libzip/libzip_1.8.0.bb new file +24 -0
@@ -0,0 +1,24 @@ +DESCRIPTION = "libzip is a C library for reading, creating, and modifying zip archives." +HOMEPAGE = "https://libzip.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=067e9870bba57e1ce20695c4d5672f30" + +DEPENDS = "zlib bzip2" + +PACKAGECONFIG[ssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[lzma] = "-DENABLE_LZMA=ON,-DENABLE_LZMA=OFF,xz" +PACKAGECONFIG[gnutls] = "-DENABLE_GNUTLS=ON,-DENABLE_GNUTLS=OFF,gnutls nettle" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF,zstd" +PACKAGECONFIG[mbedtls] = "-DENABLE_MBEDTLS=ON,-DENABLE_MBEDTLS=OFF,mbedtls" +PACKAGECONFIG[examples] = "-DENABLE_EXAMPLES=ON,-DENABLE_EXAMPLES=OFF," +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOLS=OFF," +PACKAGECONFIG[tests] = "-DBUILD_REGRESS=ON,-DBUILD_REGRESS=OFF," + +PACKAGECONFIG ?= "ssl lzma tools examples" + +inherit cmake + +SRC_URI = "https://libzip.org/download/libzip-${PV}.tar.xz" + +SRC_URI[sha256sum] = "f0763bda24ba947e80430be787c4b068d8b6aa6027a26a19923f0acfa3dac97e"
Signature · 1 line
2.32.0
PATCH 2/5 czmq: Inherit pkgconfig
This is required for cmake's find_package to work
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377da UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" -inherit cmake +inherit cmake pkgconfig PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg"
Signature · 1 line
2.32.0
PATCH 3/5 czmq: Add libmicrohttpd feature via packageconfig
In reply to Khem RajKeep it disabled by default
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +1 -0
@@ -27,6 +27,7 @@ PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" +PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.32.0
PATCH 4/5 czmq: Use Cmake knobs to enable/disable designed packageconfigs
In reply to Khem RajCMAKE_DISABLE_FIND_PACKAGE_<pkg> disables detection and would achieve same but ON/OFF seems easier to understand
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +4 -4
@@ -23,11 +23,11 @@ FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" RDEPENDS_lib${BPN}-dev = "zeromq-dev" PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" -PACKAGECONFIG[curl] = ",-DCMAKE_DISABLE_FIND_PACKAGE_libcurl=TRUE,curl" -PACKAGECONFIG[systemd] = ",-DCMAKE_DISABLE_FIND_PACKAGE_systemd=TRUE,systemd" +PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" +PACKAGECONFIG[lz4] = "-DCZMQ_WITH_LZ4=ON,-DCZMQ_WITH_LZ4=OFF,lz4" +PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" +PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux" BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.32.0
PATCH 5/5 czmq: Add nss packageconfig
In reply to Khem RajIts already disabled by default so no changes otherwise
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +1 -0
@@ -26,6 +26,7 @@ PACKAGECONFIG ??= "lz4 uuid curl ${@bb.utils.filter('DISTRO_FEATURES', 'systemd' PACKAGECONFIG[curl] = "-DCZMQ_WITH_LIBCURL=ON,-DCZMQ_WITH_LIBCURL=OFF,curl" PACKAGECONFIG[httpd] = "-DCZMQ_WITH_LIBMICROHTTPD=ON,-DCZMQ_WITH_LIBMICROHTTPD=OFF,libmicrohttpd" PACKAGECONFIG[lz4] = "-DCZMQ_WITH_LZ4=ON,-DCZMQ_WITH_LZ4=OFF,lz4" +PACKAGECONFIG[nss] = "-DCZMQ_WITH_NSS=ON,-DCZMQ_WITH_NSS=OFF,nss" PACKAGECONFIG[systemd] = "-DCZMQ_WITH_SYSTEMD=ON,-DCZMQ_WITH_SYSTEMD=OFF,systemd" PACKAGECONFIG[uuid] = "-DCZMQ_WITH_UUID=ON,-DCZMQ_WITH_UUID=OFF,util-linux"
Signature · 1 line
2.32.0