From cc493b34d8853e49dcaa88336ed73032f5192372 Mon Sep 17 00:00:00 2001 From: "mark.yang" Date: Thu, 27 Mar 2025 16:26:06 +0900 Subject: poco: fix build with gcc-15.0.1 * 0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch backport fix from: https://github.com/pocoproject/poco/commit/03c35cf In file included from poco/1.13.3/git/Data/src/SimpleRowFormatter.cpp:15: poco/1.13.3/git/Data/include/Poco/Data/SimpleRowFormatter.h:114:21: error: declaration of 'std::_Require >, std::is_move_constructible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' has a different exception specifier 114 | inline void swap(Poco::Data::SimpleRowFormatter& s1, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from poco/1.13.3/recipe-sysroot/usr/include/c++/15.0.1/bits/new_allocator.h:36, from poco/1.13.3/recipe-sysroot/usr/include/c++/15.0.1/aarch64-VENDOR-linux/bits/c++allocator.h:33, from poco/1.13.3/recipe-sysroot/usr/include/c++/15.0.1/bits/allocator.h:46, from poco/1.13.3/recipe-sysroot/usr/include/c++/15.0.1/string:45, from poco/1.13.3/git/Foundation/include/Poco/Foundation.h:94, from poco/1.13.3/git/Data/include/Poco/Data/Data.h:23, from poco/1.13.3/git/Data/include/Poco/Data/SimpleRowFormatter.h:21: * 0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch backport fix from: https://github.com/pocoproject/poco/commit/6faf907 In file included from poco/1.13.3/git/Foundation/testsuite/src/PriorityEventTest.cpp:15: poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h: In member function 'Poco::PriorityDelegate& Poco::PriorityDelegate::operator=(const Poco::PriorityDelegate&)': poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h:203:31: error: 'class Poco::PriorityDelegate' has no member named '_pTarget' [-Wtemplate-body] 203 | this->_pTarget = delegate._pTarget; | ^~~~~~~~ poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h:203:58: error: 'const class Poco::PriorityDelegate' has no member named '_pTarget' [-Wtemplate-body] 203 | this->_pTarget = delegate._pTarget; | ^~~~~~~~ poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h: In member function 'Poco::PriorityDelegate& Poco::PriorityDelegate::operator=(const Poco::PriorityDelegate&)': poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h:277:31: error: 'class Poco::PriorityDelegate' has no member named '_pTarget' [-Wtemplate-body] 277 | this->_pTarget = delegate._pTarget; | ^~~~~~~~ poco/1.13.3/git/Foundation/include/Poco/PriorityDelegate.h:277:58: error: 'const class Poco::PriorityDelegate' has no member named '_pTarget' [-Wtemplate-body] 277 | this->_pTarget = delegate._pTarget; | ^~~~~~~~ Signed-off-by: mark.yang Signed-off-by: Khem Raj --- ...rmatter.h-fix-the-build-on-gcc-15-unsatis.patch | 59 ++++++++++++++++++++++ ...ion-Build-error-with-GCC-15-class-Poco-Pr.patch | 53 +++++++++++++++++++ meta-oe/recipes-support/poco/poco_1.13.3.bb | 2 + 3 files changed, 114 insertions(+) create mode 100644 meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch create mode 100644 meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch (limited to 'meta-oe/recipes-support') diff --git a/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch new file mode 100644 index 0000000000..d976a1f83b --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch @@ -0,0 +1,59 @@ +From 03c35cff930e421199b586c33a00eb6cc537ba28 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Thu, 19 Sep 2024 09:36:48 +0100 +Subject: [PATCH] SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied + `noexcept`) + +On today's `gcc-15` poco fails to build as: + + In file included from /build/source/Data/include/Poco/Data/Statement.h:27, + from /build/source/Data/include/Poco/Data/Session.h:23, + from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:22, + from /build/source/Data/src/ArchiveStrategy.cpp:15: + /build/source/Data/include/Poco/Data/SimpleRowFormatter.h:114:21: error: declaration of 'std::_Require >, std::is_move_construc + tible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' has a different exception specifier + 114 | inline void swap(Poco::Data::SimpleRowFormatter& s1, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + In file included from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/new_allocator.h:36, + from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33, + from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/allocator.h:46, + from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/string:43, + from /build/source/Foundation/include/Poco/Foundation.h:94, + from /build/source/Data/include/Poco/Data/Data.h:23, + from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:21: + /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/move.h:214:5: note: from previous declaration 'std::_Require >, std::is_move_constructible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept (false) [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' + 214 | swap(_Tp& __a, _Tp& __b) + | ^~~~ + +Possibly because `SimpleRowFormatter` does not have constructors and +assignment operators that involve rvalue references? + +Updated `noexcept` condition. Fixes the build on` gcc-15`. Still +compiles on `gcc-13`. + +Upstream-Status: Backport [03c35cf SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied `noexcept`)] +Signed-off-by: mark.yang +--- + Data/include/Poco/Data/SimpleRowFormatter.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h +index 0dcb43b0b..c8417b3a7 100644 +--- a/Data/include/Poco/Data/SimpleRowFormatter.h ++++ b/Data/include/Poco/Data/SimpleRowFormatter.h +@@ -109,13 +109,10 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const + + namespace std + { +- // Note: for an unknown reason, clang refuses to compile this function as noexcept + template<> + inline void swap(Poco::Data::SimpleRowFormatter& s1, + Poco::Data::SimpleRowFormatter& s2) +-#ifndef POCO_COMPILER_CLANG +- noexcept +-#endif ++ noexcept(std::is_nothrow_swappable_v) + /// Full template specalization of std:::swap for SimpleRowFormatter + { + s1.swap(s2); + diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch new file mode 100644 index 0000000000..e607063d58 --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch @@ -0,0 +1,53 @@ +From 6faf90773a7327e54342a5d3caee151623b5caf0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= +Date: Fri, 27 Sep 2024 08:53:18 +0200 +Subject: [PATCH] =?UTF-8?q?fix(Foundation):=20Build=20error=20with=20GCC-1?= + =?UTF-8?q?5=20(class=20Poco::PriorityDelegate?= + =?UTF-8?q?=E2=80=99=20has=20no=20member=20named=20=E2=80=98=5FpTarget?= + =?UTF-8?q?=E2=80=99)=20(#4695)?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport [6faf907 fix(Foundation): Build error with GCC-15 (class Poco::PriorityDelegate’ has no member named ‘_pTarget’) (#4695)] +Signed-off-by: mark.yang +--- + Foundation/include/Poco/PriorityDelegate.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/Foundation/include/Poco/PriorityDelegate.h b/Foundation/include/Poco/PriorityDelegate.h +index 4cd664aab..cac9cf25e 100644 +--- a/Foundation/include/Poco/PriorityDelegate.h ++++ b/Foundation/include/Poco/PriorityDelegate.h +@@ -52,7 +52,6 @@ public: + { + if (&delegate != this) + { +- this->_pTarget = delegate._pTarget; + this->_receiverObject = delegate._receiverObject; + this->_receiverMethod = delegate._receiverMethod; + this->_priority = delegate._priority; +@@ -126,7 +125,6 @@ public: + { + if (&delegate != this) + { +- this->_pTarget = delegate._pTarget; + this->_receiverObject = delegate._receiverObject; + this->_receiverMethod = delegate._receiverMethod; + this->_priority = delegate._priority; +@@ -200,7 +198,6 @@ public: + { + if (&delegate != this) + { +- this->_pTarget = delegate._pTarget; + this->_receiverObject = delegate._receiverObject; + this->_receiverMethod = delegate._receiverMethod; + this->_priority = delegate._priority; +@@ -274,7 +271,6 @@ public: + { + if (&delegate != this) + { +- this->_pTarget = delegate._pTarget; + this->_receiverObject = delegate._receiverObject; + this->_receiverMethod = delegate._receiverMethod; + this->_priority = delegate._priority; 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 0beffab99f..662caa27d7 100644 --- a/meta-oe/recipes-support/poco/poco_1.13.3.bb +++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb @@ -11,6 +11,8 @@ DEPENDS = "libpcre2 zlib" 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 \ + file://0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch \ + file://0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch \ " SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4" -- cgit v1.2.3-54-g00ecf