diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-connectivity/zeromq')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/cppzmq_git.bb | 4 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch | 19 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb (renamed from meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb) | 4 |
3 files changed, 17 insertions, 10 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 0b66970a9..9f68eb48a 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 = "8d5c9a88988dcbebb72939ca0939d432230ffde1" -PV = "4.6.0" +SRCREV = "fef905d5982aaeb4f4bac5cccbdf8bea72728a10" +PV = "4.7.0" SRC_URI = "git://github.com/zeromq/cppzmq.git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch index eb3dee4d3..3b0300c8a 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch @@ -1,6 +1,7 @@ +From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 From: Niko Mauno <niko.mauno@vaisala.com> -Date: Wed Apr 22 09:00:00 2020 +0300 -Subject: CMakeLists.txt: Avoid host-specific path to libsodium +Date: Wed, 22 Apr 2020 09:00:00 +0300 +Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium Avoid propagating full build host specific path to generated ZeroMQTargets.cmake when building with libsodium, which changes the @@ -17,10 +18,16 @@ Upstream-Status: Pending Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e92141d..d0775c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1210,7 +1210,7 @@ - target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1428,7 +1428,7 @@ if(BUILD_SHARED) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) @@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> # On Solaris, libsodium depends on libssp if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") target_link_libraries(libzmq ssp) -@@ -1240,7 +1240,7 @@ - target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +@@ -1473,7 +1473,7 @@ if(BUILD_STATIC) + endif() if(SODIUM_FOUND) - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb index 02a4c04fd..a10500475 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb @@ -10,8 +10,8 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" -SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" +SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" +SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" |