From 56a3499ea9e3207f6117156a97ecf5e82d003299 Mon Sep 17 00:00:00 2001 From: Vincent Prince Date: Thu, 4 Apr 2019 15:58:59 +0200 Subject: czmq: bump version 4.1.1 => 4.2.0 Also, add curl and systemd to PACKAGECONFIG Signed-off-by: Vincent Prince Signed-off-by: Khem Raj --- meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb | 30 --------------------- meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb | 30 +++++++++++++++++++++ .../0001-Problem-out-of-date-with-zproject.patch | 31 ---------------------- 3 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb create mode 100644 meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb delete mode 100644 meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb deleted file mode 100644 index f2db0041c7..0000000000 --- a/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "C bindings for ZeroMQ" -HOMEPAGE = "http://www.zeromq.org" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" -DEPENDS = "zeromq" - -SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz \ - file://0001-Problem-out-of-date-with-zproject.patch \ -" - -SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf" -SRC_URI[sha256sum] = "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0" - -inherit cmake - -PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" - -FILES_${PN} = "${bindir}/*" -FILES_lib${BPN} = "${libdir}/*.so.*" -FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir}" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" - -RDEPENDS_lib${BPN}-dev = "zeromq-dev" - -PACKAGECONFIG ??= "lz4 uuid" -PACKAGECONFIG[lz4] = ",-DCMAKE_DISABLE_FIND_PACKAGE_lz4=TRUE,lz4" -PACKAGECONFIG[uuid] = ",-DCMAKE_DISABLE_FIND_PACKAGE_uuid=TRUE,util-linux" - -BBCLASSEXTEND = "nativesdk" - diff --git a/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb new file mode 100644 index 0000000000..4ec1c04092 --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "High-level C binding for 0MQ" +HOMEPAGE = "http://czmq.zeromq.org/" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3" +DEPENDS = "zeromq" + +SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" + +SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722" +SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb" + +inherit cmake + +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev ${PN} ${PN}-dbg" + +FILES_${PN} = "${bindir}/*" +FILES_lib${BPN} = "${libdir}/*.so.*" +FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" +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" + +BBCLASSEXTEND = "nativesdk" + diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch deleted file mode 100644 index 5f5702c8c8..0000000000 --- a/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d155ffd33630f80b23c31b3a6e01da221dd9bd13 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Fri, 30 Mar 2018 16:36:22 +0100 -Subject: [PATCH] Problem: out of date with zproject - -Upstream-Status: backport -Signed-off-by: Adrian Bunk - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3b81722..4f203461 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -38,7 +38,7 @@ if (NOT CMAKE_BUILD_TYPE) - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - message(STATUS "git workspace root [${git_result}]: ${git_root}") -- if ( "${git_result}" == "0" ) -+ if ( "${git_result}" STREQUAL "0" ) - set (CMAKE_BUILD_TYPE Debug) - else () - set (CMAKE_BUILD_TYPE Release) -@@ -608,7 +608,7 @@ add_custom_command( - TARGET distclean - ) - --include(ClangFormat) -+include(ClangFormat OPTIONAL) - - ######################################################################## - # summary - -- cgit v1.2.3-54-g00ecf