helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-09-30 17:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

zeromq: upgrade 4.3.2 -> 4.3.3

Browse Source 
Refresh the following patch:
0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zang Ruochen 2020-09-11 21:30:15 +08:00 committed by Khem Raj
parent 11836a399f
commit 117b3f9550
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch
View File

@ -1,6 +1,7 @@
From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001
From: Niko Mauno <niko.mauno@vaisala.com> From: Niko Mauno <niko.mauno@vaisala.com>
Date: Wed Apr 22 09:00:00 2020 +0300 Date: Wed, 22 Apr 2020 09:00:00 +0300
Subject: CMakeLists.txt: Avoid host-specific path to libsodium Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium
Avoid propagating full build host specific path to generated Avoid propagating full build host specific path to generated
ZeroMQTargets.cmake when building with libsodium, which changes the 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> 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 --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1210,7 +1210,7 @@ @@ -1428,7 +1428,7 @@ if(BUILD_SHARED)
target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) endif()
if(SODIUM_FOUND) if(SODIUM_FOUND)
- target_link_libraries(libzmq ${SODIUM_LIBRARIES}) - 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 # On Solaris, libsodium depends on libssp
if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
target_link_libraries(libzmq ssp) target_link_libraries(libzmq ssp)
@@ -1240,7 +1240,7 @@ @@ -1473,7 +1473,7 @@ if(BUILD_STATIC)
target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) endif()
if(SODIUM_FOUND) if(SODIUM_FOUND)
- target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES})

4
meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb → meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb
View File

@ -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://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \
file://run-ptest \ file://run-ptest \
" "
SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9"
SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases"