From d0c4bdc2fa5b3f4d00d5c1160088197114deb4d5 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 13 Jul 2016 13:37:35 -0400 Subject: zeromq: Update to version 4.1.5. Added PACKAGECONFIG to use libsodium instead of builtin tweetnacl. Compiling with current master led to: | ../zeromq-4.1.5/src/ctx.cpp:50:28: fatal error: randombytes.h: No such file or directory | # include "randombytes.h" | ^ | compilation terminated. | Makefile:2573: recipe for target 'src/libzmq_la-ctx.lo' failed | make[1]: *** [src/libzmq_la-ctx.lo] Error 1 | make[1]: *** Waiting for unfinished jobs.... | In file included from ../zeromq-4.1.5/src/curve_client.cpp:41:0: | ../zeromq-4.1.5/src/curve_client.hpp:39:31: fatal error: tweetnacl_base.h: No such file or directory | # include "tweetnacl_base.h" | ^ | compilation terminated. Using external libsodium works around this. The default for PACKAGECONFIG is set to use external libsodium so the recipe builds. Signed-off-by: Philip Balister Signed-off-by: Martin Jansa --- .../recipes-connectivity/zeromq/zeromq_4.1.4.bb | 30 -------------------- .../recipes-connectivity/zeromq/zeromq_4.1.5.bb | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 30 deletions(-) delete mode 100644 meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb create mode 100644 meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb deleted file mode 100644 index 2090152da2..0000000000 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb +++ /dev/null @@ -1,30 +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" -DEPENDS = "libsodium" - -SRC_URI = "http://download.zeromq.org/zeromq-${PV}.tar.gz \ - file://run-ptest \ - " -SRC_URI[md5sum] = "a611ecc93fffeb6d058c0e6edf4ad4fb" -SRC_URI[sha256sum] = "e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378" - -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}/.libs/test_* ${D}${PTEST_PATH}/tests -} diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb new file mode 100644 index 0000000000..3fa572415c --- /dev/null +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb @@ -0,0 +1,32 @@ +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/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \ + file://run-ptest \ + " +SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac" +SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf" + +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}/.libs/test_* ${D}${PTEST_PATH}/tests +} -- cgit 1.2.3-korg