diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb) | 18 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch | 31 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb | 26 |
5 files changed, 39 insertions, 74 deletions
diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb index 9aff59c6c..11ea3be95 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb @@ -4,8 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=db174eaf7b55a34a7c89551197f66e94" DEPENDS = "zeromq" -SRCREV = "6aa3ab686e916cb0e62df7fa7d12e0b13ae9fae6" -PV = "4.2.3+git${SRCPV}" +SRCREV = "213da0b04ae3b4d846c9abc46bab87f86bfb9cf4" +PV = "4.3.0" SRC_URI = "git://github.com/zeromq/cppzmq.git" @@ -13,6 +13,8 @@ S = "${WORKDIR}/git" inherit cmake +EXTRA_OECMAKE = "-DCPPZMQ_BUILD_TESTS=OFF" + PACKAGES = "${PN}-dev" RDEPENDS_${PN}-dev = "zeromq-dev" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb index f2db0041c..4ec1c0409 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.0.bb @@ -1,15 +1,13 @@ -DESCRIPTION = "C bindings for ZeroMQ" -HOMEPAGE = "http://www.zeromq.org" +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 \ - file://0001-Problem-out-of-date-with-zproject.patch \ -" +SRC_URI = "https://github.com/zeromq/czmq/releases/download/v${PV}/czmq-${PV}.tar.gz" -SRC_URI[md5sum] = "6d3a6fdd25c2bb29897c53670dce97bf" -SRC_URI[sha256sum] = "f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0" +SRC_URI[md5sum] = "7e09997db6ac3b25e8ed104053040722" +SRC_URI[sha256sum] = "cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb" inherit cmake @@ -17,14 +15,16 @@ 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}-dev = "${libdir}/*.so ${libdir}/pkgconfig ${includedir} ${datadir}/cmake" FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" RDEPENDS_lib${BPN}-dev = "zeromq-dev" -PACKAGECONFIG ??= "lz4 uuid" +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-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-Problem-out-of-date-with-zproject.patch deleted file mode 100644 index 5f5702c8c..000000000 --- a/meta-openembedded/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 <luca.boccassi@gmail.com> -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 <bunk@stusta.de> - -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 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb deleted file mode 100644 index 356348b43..000000000 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.2.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" -HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" - -PACKAGECONFIG ??= "libsodium" -PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium" - -SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ - file://run-ptest \ -" -SRC_URI[md5sum] = "a1c95b34384257e986842f4d006957b8" -SRC_URI[sha256sum] = "cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f" - -S = "${WORKDIR}/zeromq-${PV}" - -#Uncomment to choose polling system manually. valid values are kqueue, epoll, devpoll, poll or select -#EXTRA_OECONF += "--with-poller=kqueue" -#CFLAGS_append = " -O0" -#CXXFLAGS_append = " -O0" - -inherit autotools ptest pkgconfig - -do_compile_ptest () { - echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/tests/.libs/test_* ${D}${PTEST_PATH}/tests -} diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb new file mode 100644 index 000000000..6e1337646 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" + +PACKAGECONFIG ??= "libsodium" +PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium" + +SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \ + file://run-ptest \ +" +SRC_URI[md5sum] = "64cbf3577afdbfda30358bc757a6ac83" +SRC_URI[sha256sum] = "bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb" + +inherit cmake ptest pkgconfig + +EXTRA_OECMAKE = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DBUILD_TESTS=ON', '-DBUILD_TESTS=OFF', d)} \ + -DCMAKE_SKIP_RPATH=ON \ +" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/bin/test_* ${D}${PTEST_PATH}/tests +} + +FILES_${PN}-doc += "${datadir}/zmq/*.txt" |