diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch deleted file mode 100644 index b06135222a..0000000000 --- a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 26 Jan 2023 14:56:36 -0800 -Subject: [PATCH] Use std::atomic instead of std::atomic - -GCC on RISCV does not yet support inline subword atomics [1] -Therefore avoid them until fixed - -Upstream-Status: Pending - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 - -Signed-off-by: Khem Raj ---- - Foundation/include/Poco/AsyncChannel.h | 2 +- - Foundation/src/AsyncChannel.cpp | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h -index 190bae7dd..d73ea6c72 100644 ---- a/Foundation/include/Poco/AsyncChannel.h -+++ b/Foundation/include/Poco/AsyncChannel.h -@@ -111,7 +111,7 @@ private: - NotificationQueue _queue; - std::size_t _queueSize = 0; - std::size_t _dropCount = 0; -- std::atomic _closed; -+ std::atomic _closed; - }; - - -diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp -index 37cdec477..e829b180c 100644 ---- a/Foundation/src/AsyncChannel.cpp -+++ b/Foundation/src/AsyncChannel.cpp -@@ -48,11 +48,10 @@ private: - Message _msg; - }; - -- - AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): - _pChannel(pChannel), - _thread("AsyncChannel"), -- _closed(false) -+ _closed(0) - { - _thread.setPriority(prio); - } -@@ -95,7 +94,7 @@ void AsyncChannel::open() - - void AsyncChannel::close() - { -- if (!_closed.exchange(true)) -+ if (!_closed.exchange(1)) - { - if (_thread.isRunning()) - { --- -2.39.1 - diff --git a/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb index 6ad577b37b..0beffab99f 100644 --- a/meta-oe/recipes-support/poco/poco_1.13.3.bb +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" # These dependencies are required by Foundation DEPENDS = "libpcre2 zlib" -SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ - file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ +SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \ file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ file://run-ptest \ " -SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" +SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)"