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 <[email protected]> --- .../zeromq/{zeromq_4.1.4.bb => zeromq_4.1.5.bb} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.1.4.bb => zeromq_4.1.5.bb} (69%) diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb similarity index 69% rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb index 2090152..3fa5724 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb +++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb @@ -2,13 +2,15 @@ DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like 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 \ +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] = "a611ecc93fffeb6d058c0e6edf4ad4fb" -SRC_URI[sha256sum] = "e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378" +SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac" +SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf" S = "${WORKDIR}/zeromq-${PV}" -- 2.5.5 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
