A backported patch has been removed as it is no longer needed.
License-Update: Relicensed as MPL-2.0
Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
---
...cator.hpp-define-missing-rebind-type.patch | 64 -------------------
.../{zeromq_4.3.4.bb => zeromq_4.3.5.bb} | 8 +--
2 files changed, 3 insertions(+), 69 deletions(-)
delete mode 100644
meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.3.4.bb =>
zeromq_4.3.5.bb} (71%)
diff --git
a/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
b/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
deleted file mode 100644
index d32190818..000000000
---
a/meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 66e72389cc90625ed74e8ba1ea3a65234bdb06b5 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <sly...@gmail.com>
-Date: Tue, 20 Dec 2022 21:45:16 +0000
-Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
-
-`gcc-13` added an assert to standard headers to make sure custom
-allocators have intended implementation of rebind type instead
-of inherited rebind. gcc change:
- https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
-
-Without the fix build fails on this week's `gcc-13` as:
-
- [ 92%] Building CXX object
tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
- In file included from
/<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
- from
/<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
- from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
- from tests/../src/secure_allocator.hpp:42,
- from tests/../src/curve_client_tools.hpp:49,
- from tests/test_security_curve.cpp:53:
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In
instantiation of 'struct
std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>,
unsigned char, void>':
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:
required by substitution of 'template<class _Alloc, class _Up> using
std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc,
_Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up =
unsigned char]'
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:
required by substitution of 'template<class _Alloc> template<class _Tp> using
std::allocator_traits< <template-parameter-1-1> >::rebind_alloc =
std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc =
zmq::secure_allocator_t<unsigned char>]'
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:
required from 'struct
__gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned
char>::rebind<unsigned char>'
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21: required
from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned
char> >'
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:
required from 'class std::vector<unsigned char,
zmq::secure_allocator_t<unsigned char> >'
- tests/../src/curve_client_tools.hpp:64:76: required from here
- /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error:
static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must
be A
- 70 | _Tp>::value,
- | ^~~~~
-
-The change adds trivial `rebind` definition with expected return type
-and satisfies conversion requirements.
-
-Upstream-Status: Backport [https://github.com/zeromq/libzmq/commit/438d5d88]
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
----
- src/secure_allocator.hpp | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp
-index 0d37e7ed..5b8de9e2 100644
---- a/src/secure_allocator.hpp
-+++ b/src/secure_allocator.hpp
-@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_t<T> &, const
secure_allocator_t<U> &)
- #else
- template <typename T> struct secure_allocator_t : std::allocator<T>
- {
-+ secure_allocator_t () ZMQ_DEFAULT;
-+
-+ template <class U>
-+ secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
-+ {
-+ }
-+
-+ template <class U> struct rebind
-+ {
-+ typedef secure_allocator_t<U> other;
-+ };
- };
- #endif
- }
---
-2.39.1
-
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb
b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
similarity index 71%
rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb
rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
index cd319b5d3..555458217 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb
@@ -1,18 +1,16 @@
DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts
like a concurrency framework"
HOMEPAGE = "http://www.zeromq.org";
-LICENSE = "LGPL-3.0-with-zeromq-exception"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
PACKAGECONFIG ??= "libsodium"
PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF,
libsodium"
SRC_URI =
"http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \
file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \
- file://0001-src-secure_allocator.hpp-define-missing-rebind-type.patch \
file://run-ptest \
"
-SRC_URI[md5sum] = "c897d4005a3f0b8276b00b7921412379"
-SRC_URI[sha256sum] =
"c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5"
+SRC_URI[sha256sum] =
"6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases";
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#106986):
https://lists.openembedded.org/g/openembedded-devel/message/106986
Mute This Topic: https://lists.openembedded.org/mt/102740875/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
