diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-09-11 21:30:15 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-09-10 21:20:23 -0700 |
commit | 117b3f95507b464aafe6a1948cf4a79f26194acb (patch) | |
tree | 9f1cd334c836172c0fb158836f961c3085521005 | |
parent | 11836a399f4db0982eaf4d01e815a5a7c4e3eb50 (diff) | |
download | meta-openembedded-117b3f95507b464aafe6a1948cf4a79f26194acb.tar.gz |
zeromq: upgrade 4.3.2 -> 4.3.3
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>
-rw-r--r-- | meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch | 19 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb (renamed from meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb) | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch index eb3dee4d3..3b0300c8a 100644 --- a/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch +++ b/meta-oe/recipes-connectivity/zeromq/files/0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch | |||
@@ -1,6 +1,7 @@ | |||
1 | From 24ad50286a87833329213dc0b0e68c21aeeee95f Mon Sep 17 00:00:00 2001 | ||
1 | From: Niko Mauno <niko.mauno@vaisala.com> | 2 | From: Niko Mauno <niko.mauno@vaisala.com> |
2 | Date: Wed Apr 22 09:00:00 2020 +0300 | 3 | Date: Wed, 22 Apr 2020 09:00:00 +0300 |
3 | Subject: CMakeLists.txt: Avoid host-specific path to libsodium | 4 | Subject: [PATCH] CMakeLists.txt: Avoid host-specific path to libsodium |
4 | 5 | ||
5 | Avoid propagating full build host specific path to generated | 6 | Avoid propagating full build host specific path to generated |
6 | ZeroMQTargets.cmake when building with libsodium, which changes the | 7 | ZeroMQTargets.cmake when building with libsodium, which changes the |
@@ -17,10 +18,16 @@ Upstream-Status: Pending | |||
17 | 18 | ||
18 | Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> | 19 | Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> |
19 | 20 | ||
21 | --- | ||
22 | CMakeLists.txt | 4 ++-- | ||
23 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
26 | index e92141d..d0775c1 100644 | ||
20 | --- a/CMakeLists.txt | 27 | --- a/CMakeLists.txt |
21 | +++ b/CMakeLists.txt | 28 | +++ b/CMakeLists.txt |
22 | @@ -1210,7 +1210,7 @@ | 29 | @@ -1428,7 +1428,7 @@ if(BUILD_SHARED) |
23 | target_link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | 30 | endif() |
24 | 31 | ||
25 | if(SODIUM_FOUND) | 32 | if(SODIUM_FOUND) |
26 | - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) | 33 | - target_link_libraries(libzmq ${SODIUM_LIBRARIES}) |
@@ -28,8 +35,8 @@ Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> | |||
28 | # On Solaris, libsodium depends on libssp | 35 | # On Solaris, libsodium depends on libssp |
29 | if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") | 36 | if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS") |
30 | target_link_libraries(libzmq ssp) | 37 | target_link_libraries(libzmq ssp) |
31 | @@ -1240,7 +1240,7 @@ | 38 | @@ -1473,7 +1473,7 @@ if(BUILD_STATIC) |
32 | target_link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) | 39 | endif() |
33 | 40 | ||
34 | if(SODIUM_FOUND) | 41 | if(SODIUM_FOUND) |
35 | - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) | 42 | - target_link_libraries(libzmq-static ${SODIUM_LIBRARIES}) |
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.3.bb index 02a4c04fd..a10500475 100644 --- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.2.bb +++ b/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} | |||
10 | file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ | 10 | file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \ |
11 | file://run-ptest \ | 11 | file://run-ptest \ |
12 | " | 12 | " |
13 | SRC_URI[md5sum] = "2047e917c2cc93505e2579bcba67a573" | 13 | SRC_URI[md5sum] = "78acc277d95e10812d71b2b3c3c3c9a9" |
14 | SRC_URI[sha256sum] = "ebd7b5c830d6428956b67a0454a7f8cbed1de74b3b01e5c33c5378e22740f763" | 14 | SRC_URI[sha256sum] = "9d9285db37ae942ed0780c016da87060497877af45094ff9e1a1ca736e3875a2" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" | 16 | UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" |
17 | 17 | ||