From 89293db2a92597a8e459bec97df365520a3ae4de Mon Sep 17 00:00:00 2001 From: Ryan Zoeller Date: Tue, 21 Jan 2025 14:17:51 -0600 Subject: [PATCH] [poco] include patch to remove libatomic dependency (#43316) --- .../0009-remove-libatomic-dependency.patch | 22 +++++++++++++++++++ ports/poco/portfile.cmake | 3 +++ ports/poco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/poco.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/poco/0009-remove-libatomic-dependency.patch diff --git a/ports/poco/0009-remove-libatomic-dependency.patch b/ports/poco/0009-remove-libatomic-dependency.patch new file mode 100644 index 0000000000..8cbab6db8b --- /dev/null +++ b/ports/poco/0009-remove-libatomic-dependency.patch @@ -0,0 +1,22 @@ +From e2576ff5ab9f4a69a7d560cd378a377022501a9a Mon Sep 17 00:00:00 2001 +From: Aleksandar Fabijanic +Date: Sat, 7 Dec 2024 17:35:39 -0500 +Subject: [PATCH] fix(cmake): remove libatomic dependency (#4811) + +--- + Foundation/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt +index 5898d22f5c..e985cc39a7 100644 +--- a/Foundation/CMakeLists.txt ++++ b/Foundation/CMakeLists.txt +@@ -159,7 +159,7 @@ else() + target_link_libraries(Foundation PUBLIC ${CMAKE_DL_LIBS} rt Threads::Threads) + else() + target_compile_definitions(Foundation PUBLIC _XOPEN_SOURCE=500 POCO_HAVE_FD_EPOLL) +- target_link_libraries(Foundation PUBLIC pthread atomic ${CMAKE_DL_LIBS} rt) ++ target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt) + endif() + endif(APPLE) + endif(UNIX AND NOT ANDROID) diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 4540dfbc18..a495d222b0 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -15,6 +15,9 @@ vcpkg_from_github( 0007-find-pcre2.patch # MSYS2 repo was used as a source. Thanks MSYS2 team: https://github.com/msys2/MINGW-packages/blob/6e7fba42b7f50e1111b7c0ef50048832243b0ac4/mingw-w64-poco/001-fix-build-on-mingw.patch 0008-fix-mingw-compilation.patch + # Should be dropped when upgrading to POC 1.14.1 + # https://github.com/pocoproject/poco/pull/4811 + 0009-remove-libatomic-dependency.patch ) file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre2.h") diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index bf27110a3c..f6ba78f2a9 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poco", "version": "1.14.0", - "port-version": 1, + "port-version": 2, "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index c460389661..399ce3484e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7126,7 +7126,7 @@ }, "poco": { "baseline": "1.14.0", - "port-version": 1 + "port-version": 2 }, "podofo": { "baseline": "0.10.4", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index 01ded956cb..fb6a64c156 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03029df7bbc88847dcd6342be29865ade0b24817", + "version": "1.14.0", + "port-version": 2 + }, { "git-tree": "efeff2dbe665e581fb0d034e2d87824d0622419e", "version": "1.14.0",