From patchwork Sat Nov 14 08:35:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianfranco Costamagna X-Patchwork-Id: 104047 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.7699.1794645330730312799 for ; Sat, 14 Nov 2026 00:35:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20260707 header.b=IMT1Cr4o; spf=pass (domain: gmail.com, ip: 209.85.214.180, mailfrom: costamagna.gianfranco@gmail.com) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2e9ae391a05so10175665ad.1 for ; Sat, 14 Nov 2026 00:35:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794645330; x=1795250130; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=8xEbNnLABh3ffvxjqRkLxYE+OzyWYRNciT+PiHO2+e8=; b=IMT1Cr4oH2tyVIW5a6+TtY3jeIKUl38dz7IcumHPeJEANqcq5d3UpqonSPWtMsSdlM gUok1s+yjFeqXSZaouaVk5FbFms6UXVmyB7vZvZkCNUd7OlgVWjgiL2+0/zyeKqg6Ih3 zyI+vaT4zmddTnyWRYHNv70Q2ZdHzW+A3J3l9kvLVaEFs602mQsMBjENdW5WdZMdsEep CL/Uk3XpgZpbepmB/1bIvhKIwFF9vmdPzidpLDi28nxRl+EXVP0p6urx60GiPTHSSRg5 bngSFDzWwtQN+MZhTl/9MfPAbzMlA9bTMNsCtmAZWsurhzu+XQ6L3+OtTcpg7OmRWaMZ j/Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794645330; x=1795250130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8xEbNnLABh3ffvxjqRkLxYE+OzyWYRNciT+PiHO2+e8=; b=zD+xMXIV5REgkUgzKPAqWthzNFynTn/n4JU59qIAYvup/GQ6BsOYJM2JKpc97Oh1pS zV3NVKv566lO/5lO+0VwCNrqjoiIBrtnUz4Svg/gda/SBISIlgQG/YEOGLSqfklnLVIN U159cArF0ac/e3OUHPe2sEdt0R3uDIonO5Ar9XyG5T5iumxnOszzrJeAj2+zNk/AVTLE YiTrmhRtQVujdWGS5VwGjfolpyz6pxmbs4FVL98pDJwbYT1fFvvbmYkDlb8+okPXilti i/YhD3afWLJl1ReN0Ng7anXXYYiASf1HrI35j4vvu79UPvH5iFKxb1bzFPgDzj7bSw+2 pi7w== X-Gm-Message-State: APuU4Z83Ol6H91zKOE936F/em2uNu/ItuAaiM71pryCFw0YRXYAjuOic dpznuSQlPDpSxxJxEvUaXxjZRCmbPIyHflSuI17B8H0FMaP3POvWM4gkLLHWbw== X-Gm-Gg: AYBFou0JyfJO93w9ZcuyMXyVkw5xL29Q0P8u3ZOQ2IwN+kvjFjmgOVZVdW4mINXy858 L0AL141yWU7+ZUrb5K0/WzJoJNEHC/Mw6QGQKdzm7zgP4Ce5E3tVquV4lnaXwJnxtE3eYvWJ5i3 yom+/6TjLrvMDLEp120ZIn9vfHUD4srlk1BP0JDiBOEMCo77pOamXaj131GVLPao9BwciLWHKgz gKNm5CTU73WMef0Dl8pKfJYpmBn4L/R5IJtAkWMITxTduOmS8F9BY6aH0xA8B4thTuwuMJOmwOV o2UXs+B3+/Oqv3wp7WD+H0lYj7HxHh4J+x4rEiotbmsGO+6QRbsntDgokbFZAYSu3pqlCkvSteb 35VSch4qeeSEo1FEhr+IAtMJ/Nji1RzGW3Hjc6QOl2hqtrB51H8iyIXJ4ov/f8VMqarLX6KqToA u5zn9BZzCj+7HysIOyhULnKTyX94sNr8YVsZIWUGKaguts2Yc8v1puyXFfxiXKCL4Mq8RARE3QK FS0EM3AzWW0BwjuVseFb90HpTtSle3PxqfwtgXtZVdP2EFtLDPri1qsK8CLYitsCSqWsYs7MHCX 1aGUnrnPah0H58rvZK3HwMrdusOWzbN9/mU3BI9hXGT/3wU7nLidnsGx1yl6sja83ht4LYwFGQJ soAV6 X-Received: by 2002:a17:903:388b:b0:2ed:662:e485 with SMTP id d9443c01a7336-2ee0d9fceefmr34999405ad.2.1794645329353; Sat, 14 Nov 2026 00:35:29 -0800 (PST) Return-Path: Received: from dld58y9k4-lin.dl.net ([2a02:b025:40:94c3:2c77:91fc:2a7f:9aac]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ee0f9f13desm18484475ad.67.2026.11.14.00.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 00:35:28 -0800 (PST) From: Gianfranco Costamagna X-Google-Original-From: Gianfranco Costamagna To: openembedded-devel@lists.openembedded.org Cc: Gianfranco Costamagna , Gianfranco Costamagna Subject: [meta-oe][PATCH 1/2] websocketpp: update to new maintained fork, update to 0.8.4-cpprest-lts and unblacklist Date: Sat, 14 Nov 2026 09:35:13 +0100 Message-ID: <20261114083514.1798099-1-locutusofborg@debian.org> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Sat, 14 Nov 2026 08:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/132255 The new fork incorporated all the patches, delete them Update license md5sum due to upstream file change Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna --- .../cpprest/cpprest_2.10.19.bb | 20 - .../0001-Correct-clang-compiler-flags.patch | 32 -- .../0001-cmake-Use-GNUInstallDirs.patch | 35 -- .../websocketpp/websocketpp-0.8.2/1024.patch | 508 ------------------ .../websocketpp/websocketpp-0.8.2/855.patch | 25 - .../websocketpp/websocketpp-0.8.2/857.patch | 134 ----- ....2.bb => websocketpp_0.8.4-cpprest-lts.bb} | 15 +- 7 files changed, 4 insertions(+), 765 deletions(-) delete mode 100644 meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb delete mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch delete mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch delete mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch delete mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch delete mode 100644 meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch rename meta-oe/recipes-support/websocketpp/{websocketpp_0.8.2.bb => websocketpp_0.8.4-cpprest-lts.bb} (62%) diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb deleted file mode 100644 index ec7be4ad37..0000000000 --- a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." -SECTION = "libs/network" -HOMEPAGE = "https://github.com/Microsoft/cpprestsdk/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" -DEPENDS = "openssl websocketpp zlib boost brotli" - -EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF" - -SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=master \ - file://disable-float-tests.patch \ - file://disable-outside-tests.patch " - -# tag 2.10.19 -SRCREV = "411a109150b270f23c8c97fa4ec9a0a4a98cdecf" - - -inherit cmake pkgconfig - -SKIP_RECIPE[cpprest] ?= "Needs websocketpp which does not yet work with boost >= 1.87" diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch deleted file mode 100644 index 7a99daf6b2..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-Correct-clang-compiler-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 10 Jan 2020 21:54:39 -0800 -Subject: [PATCH] Correct clang compiler flags - -Fix misplaced quotes, this was leading to spurious ; in compiler cmdline -Remove demanding libc++, clang can link with both libc++ and libstdc++ -and platforms have their own defaults, user can demand non defaults via -adding it to cmake flags - -Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d13117..c17354a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -154,7 +154,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - endif() - set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) - set (WEBSOCKETPP_BOOST_LIBS system thread) -- set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - if (NOT APPLE) - add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? - endif () --- -2.24.1 - diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index 0ef2e12375..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 771d79eeb0ac5079482a4b3a131bbda744793e7d Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 19 Dec 2019 20:07:11 -0800 -Subject: [PATCH] cmake: Use GNUInstallDirs - -Helps install cmakefiles in right libdir - -Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/854] -Signed-off-by: Khem Raj ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2786aba..080be3e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,11 +39,13 @@ endif() - - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - -+include(GNUInstallDirs) -+ - set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") - if (WIN32 AND NOT CYGWIN) - set (DEF_INSTALL_CMAKE_DIR cmake) - else () -- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp) -+ set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp) - endif () - set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - --- -2.24.1 - diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch deleted file mode 100644 index 12613f8b19..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/1024.patch +++ /dev/null @@ -1,508 +0,0 @@ -From 05d1189ffce562560da90056d96fe2084d84654a Mon Sep 17 00:00:00 2001 -From: "Laszlo Boszormenyi (GCS)" -Date: Mon, 14 Feb 2022 14:13:13 +0100 -Subject: [PATCH] SCons 4.2.0 no longer has env_cpp11.has_key() Check env_cpp11 - as an array. - -This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1003022 ---- -Upstream-Status: Pending - - examples/broadcast_server/SConscript | 2 +- - examples/debug_client/SConscript | 2 +- - examples/debug_server/SConscript | 2 +- - examples/dev/SConscript | 2 +- - examples/echo_client/SConscript | 2 +- - examples/echo_server/SConscript | 2 +- - examples/echo_server_both/SConscript | 2 +- - examples/echo_server_tls/SConscript | 2 +- - examples/external_io_service/SConscript | 2 +- - examples/iostream_server/SConscript | 2 +- - examples/print_client/SConscript | 2 +- - examples/print_client_tls/SConscript | 2 +- - examples/print_server/SConscript | 2 +- - examples/scratch_client/SConscript | 2 +- - examples/scratch_server/SConscript | 2 +- - examples/sip_client/SConscript | 2 +- - examples/subprotocol_server/SConscript | 2 +- - examples/telemetry_client/SConscript | 2 +- - examples/telemetry_server/SConscript | 2 +- - examples/testee_client/SConscript | 2 +- - examples/testee_server/SConscript | 2 +- - examples/utility_client/SConscript | 4 ++-- - test/connection/SConscript | 2 +- - test/endpoint/SConscript | 2 +- - test/extension/SConscript | 2 +- - test/http/SConscript | 2 +- - test/logger/SConscript | 2 +- - test/message_buffer/SConscript | 2 +- - test/processors/SConscript | 2 +- - test/random/SConscript | 2 +- - test/roles/SConscript | 2 +- - test/transport/SConscript | 2 +- - test/transport/asio/SConscript | 2 +- - test/transport/iostream/SConscript | 2 +- - test/utility/SConscript | 2 +- - 35 files changed, 36 insertions(+), 36 deletions(-) - -diff --git a/examples/broadcast_server/SConscript b/examples/broadcast_server/SConscript -index 5786f570d..06c55c147 100644 ---- a/examples/broadcast_server/SConscript -+++ b/examples/broadcast_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/debug_client/SConscript b/examples/debug_client/SConscript -index 781db8371..b92b14653 100644 ---- a/examples/debug_client/SConscript -+++ b/examples/debug_client/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/debug_server/SConscript b/examples/debug_server/SConscript -index 4d02261c6..7e24b07c8 100644 ---- a/examples/debug_server/SConscript -+++ b/examples/debug_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/dev/SConscript b/examples/dev/SConscript -index 34ddac2d5..31062fee9 100644 ---- a/examples/dev/SConscript -+++ b/examples/dev/SConscript -@@ -11,7 +11,7 @@ env_cpp11 = env_cpp11.Clone () - - prgs = [] - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11) - -diff --git a/examples/echo_client/SConscript b/examples/echo_client/SConscript -index 0e4110822..2adf1166d 100644 ---- a/examples/echo_client/SConscript -+++ b/examples/echo_client/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] - prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/echo_server/SConscript b/examples/echo_server/SConscript -index a2978852e..a48724155 100644 ---- a/examples/echo_server/SConscript -+++ b/examples/echo_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/echo_server_both/SConscript b/examples/echo_server_both/SConscript -index d1ecf202f..32f4c8c55 100644 ---- a/examples/echo_server_both/SConscript -+++ b/examples/echo_server_both/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/echo_server_tls/SConscript b/examples/echo_server_tls/SConscript -index e24cc4ce8..688bf7c14 100644 ---- a/examples/echo_server_tls/SConscript -+++ b/examples/echo_server_tls/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/external_io_service/SConscript b/examples/external_io_service/SConscript -index beb7c1c42..0abf3e175 100644 ---- a/examples/external_io_service/SConscript -+++ b/examples/external_io_service/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/iostream_server/SConscript b/examples/iostream_server/SConscript -index dc90834cf..304142082 100644 ---- a/examples/iostream_server/SConscript -+++ b/examples/iostream_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/print_client/SConscript b/examples/print_client/SConscript -index 8da4ce5b2..79fdea0fd 100644 ---- a/examples/print_client/SConscript -+++ b/examples/print_client/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('print_client', ["print_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/print_client_tls/SConscript b/examples/print_client_tls/SConscript -index 01b011473..e57b9d691 100644 ---- a/examples/print_client_tls/SConscript -+++ b/examples/print_client_tls/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - prgs += env_cpp11.Program('print_client_tls', ["print_client_tls.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/print_server/SConscript b/examples/print_server/SConscript -index 4f0e492be..454dcf01b 100644 ---- a/examples/print_server/SConscript -+++ b/examples/print_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/scratch_client/SConscript b/examples/scratch_client/SConscript -index 6e7b2ef07..4be98f437 100644 ---- a/examples/scratch_client/SConscript -+++ b/examples/scratch_client/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/scratch_server/SConscript b/examples/scratch_server/SConscript -index bf90f7433..cc495ba5c 100644 ---- a/examples/scratch_server/SConscript -+++ b/examples/scratch_server/SConscript -@@ -14,7 +14,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z'] - prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript -index fafe7b4ff..e2afefe73 100644 ---- a/examples/sip_client/SConscript -+++ b/examples/sip_client/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/subprotocol_server/SConscript b/examples/subprotocol_server/SConscript -index e97535ca5..299af43c5 100644 ---- a/examples/subprotocol_server/SConscript -+++ b/examples/subprotocol_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/telemetry_client/SConscript b/examples/telemetry_client/SConscript -index 62396a5e3..ac0e6daba 100644 ---- a/examples/telemetry_client/SConscript -+++ b/examples/telemetry_client/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/telemetry_server/SConscript b/examples/telemetry_server/SConscript -index 1b8ff2295..c620f38a4 100644 ---- a/examples/telemetry_server/SConscript -+++ b/examples/telemetry_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/testee_client/SConscript b/examples/testee_client/SConscript -index 64f0ef1f3..6154bb966 100644 ---- a/examples/testee_client/SConscript -+++ b/examples/testee_client/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] - prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/testee_server/SConscript b/examples/testee_server/SConscript -index 3c75f4ff2..ca8ffb7d7 100644 ---- a/examples/testee_server/SConscript -+++ b/examples/testee_server/SConscript -@@ -13,7 +13,7 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] - prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS) - else: -diff --git a/examples/utility_client/SConscript b/examples/utility_client/SConscript -index 6e6cd8c9d..f6d673a43 100644 ---- a/examples/utility_client/SConscript -+++ b/examples/utility_client/SConscript -@@ -13,11 +13,11 @@ env_cpp11 = env_cpp11.Clone () - prgs = [] - - # if a C++11 environment is available build using that, otherwise use boost --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) - else: - ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] - prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS) - --Return('prgs') -\ No newline at end of file -+Return('prgs') -diff --git a/test/connection/SConscript b/test/connection/SConscript -index 4ed7a4e69..b79876bf1 100644 ---- a/test/connection/SConscript -+++ b/test/connection/SConscript -@@ -16,7 +16,7 @@ objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS) - objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/endpoint/SConscript b/test/endpoint/SConscript -index 5cb3ede91..74912865e 100644 ---- a/test/endpoint/SConscript -+++ b/test/endpoint/SConscript -@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + - objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11) - prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/extension/SConscript b/test/extension/SConscript -index d8b425fda..0cb813856 100644 ---- a/test/extension/SConscript -+++ b/test/extension/SConscript -@@ -17,7 +17,7 @@ objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIB - prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] - objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/http/SConscript b/test/http/SConscript -index 0a24a8774..422998e24 100644 ---- a/test/http/SConscript -+++ b/test/http/SConscript -@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs] - objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11) - prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/logger/SConscript b/test/logger/SConscript -index 81d607601..0ccbbc5df 100644 ---- a/test/logger/SConscript -+++ b/test/logger/SConscript -@@ -15,7 +15,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] - objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11) - prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/message_buffer/SConscript b/test/message_buffer/SConscript -index 2ef6d71f3..89785cb3e 100644 ---- a/test/message_buffer/SConscript -+++ b/test/message_buffer/SConscript -@@ -17,7 +17,7 @@ objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/processors/SConscript b/test/processors/SConscript -index 406a7edc9..1b40d0b1d 100644 ---- a/test/processors/SConscript -+++ b/test/processors/SConscript -@@ -26,7 +26,7 @@ prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_L - prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z']) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z'] - # no C++11 features are used in processor so there are no C++11 versions of - # these tests. -diff --git a/test/random/SConscript b/test/random/SConscript -index 3cadc9e97..4a11b0ce5 100644 ---- a/test/random/SConscript -+++ b/test/random/SConscript -@@ -17,7 +17,7 @@ objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_ - prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/roles/SConscript b/test/roles/SConscript -index e86107ece..17b3be105 100644 ---- a/test/roles/SConscript -+++ b/test/roles/SConscript -@@ -17,7 +17,7 @@ objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/transport/SConscript b/test/transport/SConscript -index 71b31b6c5..aa9b719ec 100644 ---- a/test/transport/SConscript -+++ b/test/transport/SConscript -@@ -16,7 +16,7 @@ BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono - objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS) - prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11) - prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/transport/asio/SConscript b/test/transport/asio/SConscript -index f8185e57e..518d362b1 100644 ---- a/test/transport/asio/SConscript -+++ b/test/transport/asio/SConscript -@@ -20,7 +20,7 @@ prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] - objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/transport/iostream/SConscript b/test/transport/iostream/SConscript -index 9e74c2f15..dcaf9f2d9 100644 ---- a/test/transport/iostream/SConscript -+++ b/test/transport/iostream/SConscript -@@ -19,7 +19,7 @@ prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = - prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11) -diff --git a/test/utility/SConscript b/test/utility/SConscript -index 80e9ef6c8..6f19aa52a 100644 ---- a/test/utility/SConscript -+++ b/test/utility/SConscript -@@ -24,7 +24,7 @@ prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS) - prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS) - --if env_cpp11.has_key('WSPP_CPP11_ENABLED'): -+if 'WSPP_CPP11_ENABLED' in env_cpp11: - BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] - objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11) - objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11) diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch deleted file mode 100644 index 68cb645b40..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/855.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3590d77bb9753fbbf076028e2395182ced6466ba Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Wed, 8 Jan 2020 17:59:48 +0100 -Subject: [PATCH] Fix cmake find boost with version >= 1.71 - -For some reasons "system;thread;random;unit_test_framework" was seen as a single module, because of the quotes. ---- -Upstream-Status: Pending - - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d13117b..9a46bc10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -217,7 +217,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) - set (Boost_USE_MULTITHREADED TRUE) - set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these! - -- find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}") -+ find_package (Boost 1.39.0 COMPONENTS ${WEBSOCKETPP_BOOST_LIBS}) - - if (Boost_FOUND) - # Boost is a project wide global dependency. diff --git a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch b/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch deleted file mode 100644 index 401a614dc1..0000000000 --- a/meta-oe/recipes-support/websocketpp/websocketpp-0.8.2/857.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 931a55347a322f38eb82d5f387b2924e6c7a1746 Mon Sep 17 00:00:00 2001 -From: Gianfranco Costamagna -Date: Thu, 9 Jan 2020 10:07:20 +0100 -Subject: [PATCH] Update SConstruct with new Python3 syntax: - new raise - keyword syntax - has_key deprecated method is now removed - commands - deprecated library is replaced by subprocess - print function fixes - -This should fix FTBFS against new scons 3.1.2 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=947584 ---- -Upstream-Status: Pending - - SConstruct | 45 +++++++++++++++++++++++---------------------- - 1 file changed, 23 insertions(+), 22 deletions(-) - -diff --git a/SConstruct b/SConstruct -index ae3df10b..9d1c8914 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1,18 +1,19 @@ --import os, sys, commands -+import os, sys -+from subprocess import check_output - env = Environment(ENV = os.environ) - - # figure out a better way to configure this --if os.environ.has_key('CXX'): -+if 'CXX' in os.environ: - env['CXX'] = os.environ['CXX'] - --if os.environ.has_key('DEBUG'): -+if 'DEBUG' in os.environ: - env['DEBUG'] = os.environ['DEBUG'] - --if os.environ.has_key('CXXFLAGS'): -+if 'CXXFLAGS' in os.environ: - #env['CXXFLAGS'] = os.environ['CXXFLAGS'] - env.Append(CXXFLAGS = os.environ['CXXFLAGS']) - --if os.environ.has_key('LINKFLAGS'): -+if 'LINKFLAGS' in os.environ: - #env['LDFLAGS'] = os.environ['LDFLAGS'] - env.Append(LINKFLAGS = os.environ['LINKFLAGS']) - -@@ -22,24 +23,24 @@ if os.environ.has_key('LINKFLAGS'): - ## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and - ## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu. - ## --if os.environ.has_key('BOOSTROOT'): -+if 'BOOSTROOT' in os.environ: - os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT'] - --if os.environ.has_key('BOOST_ROOT'): -+if 'BOOST_ROOT' in os.environ: - env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT'] - env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib') --elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'): -+elif 'BOOST_INCLUDES' in os.environ and 'BOOST_LIBS' in os.environ: - env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES'] - env['BOOST_LIBS'] = os.environ['BOOST_LIBS'] - else: -- raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!" -+ raise SCons.Errors.UserError("Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS were set!") - - ## Custom OpenSSL --if os.environ.has_key('OPENSSL_PATH'): -+if 'OPENSSL_PATH' in os.environ: - env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include')) - env.Append(LIBPATH = os.environ['OPENSSL_PATH']) - --if os.environ.has_key('WSPP_ENABLE_CPP11'): -+if 'WSPP_ENABLE_CPP11' in os.environ: - env['WSPP_ENABLE_CPP11'] = True - else: - env['WSPP_ENABLE_CPP11'] = False -@@ -76,7 +77,7 @@ if env['PLATFORM'].startswith('win'): - env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags) - env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86' - elif env['PLATFORM'] == 'posix': -- if env.has_key('DEBUG'): -+ if 'DEBUG' in env: - env.Append(CCFLAGS = ['-g', '-O0']) - else: - env.Append(CPPDEFINES = ['NDEBUG']) -@@ -84,9 +85,9 @@ elif env['PLATFORM'] == 'posix': - env.Append(CCFLAGS = ['-Wall']) - #env['LINKFLAGS'] = '' - elif env['PLATFORM'] == 'darwin': -- if not os.environ.has_key('CXX'): -+ if not 'CXX' in os.environ: - env['CXX'] = "clang++" -- if env.has_key('DEBUG'): -+ if 'DEBUG' in env: - env.Append(CCFLAGS = ['-g', '-O0']) - else: - env.Append(CPPDEFINES = ['NDEBUG']) -@@ -157,29 +158,29 @@ env_cpp11 = env.Clone () - - if env_cpp11['CXX'].startswith('g++'): - # TODO: check g++ version -- GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion') -+ GCC_VERSION = check_output([env_cpp11['CXX'], '-dumpversion']) - -- if GCC_VERSION > "4.4.0": -- print "C++11 build environment partially enabled" -+ if GCC_VERSION.decode('utf-8') > "4.4.0": -+ print("C++11 build environment partially enabled") - env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) - else: -- print "C++11 build environment is not supported on this version of G++" -+ print("C++11 build environment is not supported on this version of G++") - elif env_cpp11['CXX'].startswith('clang++'): -- print "C++11 build environment enabled" -+ print("C++11 build environment enabled") - env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++']) - env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_']) - - # look for optional second boostroot compiled with clang's libc++ STL library - # this prevents warnings/errors when linking code built with two different - # incompatible STL libraries. -- if os.environ.has_key('BOOST_ROOT_CPP11'): -+ if 'BOOST_ROOT_CPP11' in os.environ: - env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11'] - env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib') -- elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'): -+ elif 'BOOST_INCLUDES_CPP11' in os.environ and 'BOOST_LIBS_CPP11' in os.environ: - env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11'] - env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11'] - else: -- print "C++11 build environment disabled" -+ print("C++11 build environment disabled") - - # if the build system is known to allow the isystem modifier for library include - # values then use it for the boost libraries. Otherwise just add them to the diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.4-cpprest-lts.bb similarity index 62% rename from meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb rename to meta-oe/recipes-support/websocketpp/websocketpp_0.8.4-cpprest-lts.bb index 17b71411ca..dde4d0b367 100644 --- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb +++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.4-cpprest-lts.bb @@ -2,16 +2,11 @@ SUMMARY = "C++/Boost Asio based websocket client/server library." SECTION = "libs/network" HOMEPAGE = "https://github.com/zaphoyd/websocketpp" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=4d168d763c111f4ffc62249870e4e0ea" +LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=caca8c57fc82d4528bfd694b3de9b7cf" DEPENDS = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'openssl boost zlib', '', d)} " -SRC_URI = "git://github.com/zaphoyd/websocketpp.git;protocol=https;branch=master \ - file://0001-cmake-Use-GNUInstallDirs.patch \ - file://855.patch \ - file://857.patch \ - file://0001-Correct-clang-compiler-flags.patch \ - file://1024.patch \ +SRC_URI = "git://github.com/cpprest-lts/websocketpp.git;protocol=https;branch=cpprest-lts \ " EXTRA_OECMAKE = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '-DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON', '', d)} " @@ -22,8 +17,8 @@ RDEPENDS:${PN}-dev = "" # to add this package to an SDK, since it isn't a reverse-dependency of anything, just use something like this: # TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev" -# tag 0.8.2 -SRCREV = "56123c87598f8b1dd471be83ca841ceae07f95ba" +# tag 0.8.4+cpprest-lts +SRCREV = "c011de4608e8221412f2ea9be5d755a68a4e5e29" inherit cmake @@ -36,5 +31,3 @@ do_install:append() { install -d ${D}${docdir}/${BPN} cp -R ${S}/examples ${D}${docdir}/${BPN} } - -SKIP_RECIPE[websocketpp] ?= "Does not work with boost >= 1.87" From patchwork Sat Nov 14 08:35:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianfranco Costamagna X-Patchwork-Id: 104048 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.7493.1794645334079278771 for ; Sat, 14 Nov 2026 00:35:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20260707 header.b=ZUww3R4b; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: costamagna.gianfranco@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2eb18f4da15so9329355ad.1 for ; Sat, 14 Nov 2026 00:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794645333; x=1795250133; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=6CuSj5BYLAokdC8gb5ft5fQgEhwUgIJKqB/NfRhkaQU=; b=ZUww3R4bRED50h0zotsNH2Tjnbx3K2PbcbV5gQhXobodCHHQZH/MlNmv++1J2OzTDH +3ASMbCoJGDnc7iPKIYDGt7EJSuITJoxLw5wIVihTmbUeQPRj6UNo3A4OcDBSDjiatoh mjj4z/O5c3Q6yUwnJ7S/eMqMwITtROfOXJrLnyTTSzKg3Yp3fsLX44xpz35uxqoh/Ptr hdn7j3FC7j18NzNl8POnsDcEP/KxJ4mkRTKSVAyWFd1dlQhj7sHN6GEl5VRUXEsuwHEZ bFvLOmtGYDtUugN/t4tbBHblnI6TyZ8brEUnpU6HbGualPZ12EBOQZoCfqdsUKJEr0d4 SfKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794645333; x=1795250133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=6CuSj5BYLAokdC8gb5ft5fQgEhwUgIJKqB/NfRhkaQU=; b=LtzatIp/R8PKgaT15AymUTUB7YhDlyb0psodXIY4+Z/dQVdKWRpBhbj3TbV4UBBEpn 1+LiLUHOfa4E5XpNhUuhd55W8dhhomvkbRXsTD2UiaSbOPZaKH3TcKmSF7jrueszPjxf xCQbYWmZ4P7EqBjPfXWCoJbA2b+8sZAipVNv2fSlMM1Df1tR1V9gWO2DepMvR1oGXh5S wnXBSyfzG+xFsuL7PkTXaff/7Hk3SqiNC4aUs8qsRGU5MKyVQ8CiTpQDWT59pI1SYJTF A0Agz9ktsSY2jlr/9HD1l7MrMvYa7nXuxQ9KBmG/TtI9yISYKmU2zePciVRKK9Rey2a/ eEQw== X-Gm-Message-State: APuU4Z9ih73KkAImUgNDDDz9N0hJwN9oH7iMurkDOt8mvjHNEWTVjip5 r/jv7aaFJ7UEv1hyD/WrNE5HfBFog92nt4sCVn0S5ZkquHlCEuj/c0csSJF6Tg== X-Gm-Gg: AYBFou2gYa2V/fQRndjgM0UAs8F4GEv1X4AblTu5wAvYCsoh/od3Khu6oj8e2jXoSQw XgbDWKg4M02kF5tB0Pi80Mtl1inKH6A5/VdQ9gPOK7ADxSEeBcykmTZU1/hqaj+bIJRTNtmbJ6X ot4zp10zXKWw1vC1BM2LXGx2f34hkmbjHnBPsTQJ7zdKS2Zh9I+G4fvbCzchYzLC7BogmCG5C3n smtotroVP7HJfgQy0X88pHKTyE+JW/buyr3Q0JctTWcRBUWL+LmdhV8O95k1uwHDxOEJbXOw/sL 4tSUn0COUneYkVJm+WJStxOJtiUEeFG28F7PQ8VhAVHkqGizbgGNYIM92CJsAQXsjEeFAyuyBOp CIgt3O8h7U9d4UW/d559JgmmDBKcyohxfhmIhZ4ebQsMypB8wz/dhSuQCEME56ai2AE7pfW9BNu zz7ThMBwbrxREhvd6ISeLiBVHce11wehW4phkUGYAOpwMvDN42eknv/BVS07KLt4y+KZ6l2fqmQ orA5S5f61zk2pJcJ12CcbJTHZsT5tbtuHPk+YPeqfWWUT0WGjVKnsf0QNUEZlUmZptCM2Rx2fO2 iF7n8X7FBJssBJRLYXuIuwJHdNe6afsf/zSycjMUyaXQ7CIeT8NaVbDm1GEIDE6FEmZnMrRZLRX 1qdhu X-Received: by 2002:a17:903:1aa7:b0:2e9:5714:6075 with SMTP id d9443c01a7336-2ee0dc938eemr50727075ad.17.1794645333057; Sat, 14 Nov 2026 00:35:33 -0800 (PST) Return-Path: Received: from dld58y9k4-lin.dl.net ([2a02:b025:40:94c3:2c77:91fc:2a7f:9aac]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ee0f9f13desm18484475ad.67.2026.11.14.00.35.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Nov 2026 00:35:32 -0800 (PST) From: Gianfranco Costamagna X-Google-Original-From: Gianfranco Costamagna To: openembedded-devel@lists.openembedded.org Cc: Gianfranco Costamagna , Gianfranco Costamagna Subject: [meta-oe][PATCH 2/2] cpprest: update to new maintained fork, update to 2.10.20-cpprest-lts and unblacklist Date: Sat, 14 Nov 2026 09:35:14 +0100 Message-ID: <20261114083514.1798099-2-locutusofborg@debian.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261114083514.1798099-1-locutusofborg@debian.org> References: <20261114083514.1798099-1-locutusofborg@debian.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by lin-tor-korg-lkml-alma10-1 with HTTPS for ; Sat, 14 Nov 2026 08:35:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/132256 The new fork incorporated all the patches, delete them Add 3 patches from Debian to: - Fix Big Endian machines test - Disable network tests via cmake switch - Fix build on Big Endian machines Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna --- .../recipes-support/cpprest/cpprest/63.patch | 180 +++++++++++++++++ .../recipes-support/cpprest/cpprest/64.patch | 182 ++++++++++++++++++ .../recipes-support/cpprest/cpprest/65.patch | 94 +++++++++ .../cpprest/cpprest/disable-float-tests.patch | 27 --- .../cpprest/disable-outside-tests.patch | 129 ------------- .../cpprest/cpprest_2.10.20+cpprest-lts.bb | 18 ++ 6 files changed, 474 insertions(+), 156 deletions(-) create mode 100644 meta-oe/recipes-support/cpprest/cpprest/63.patch create mode 100644 meta-oe/recipes-support/cpprest/cpprest/64.patch create mode 100644 meta-oe/recipes-support/cpprest/cpprest/65.patch delete mode 100644 meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch delete mode 100644 meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch create mode 100644 meta-oe/recipes-support/cpprest/cpprest_2.10.20+cpprest-lts.bb diff --git a/meta-oe/recipes-support/cpprest/cpprest/63.patch b/meta-oe/recipes-support/cpprest/cpprest/63.patch new file mode 100644 index 0000000000..72945b3db3 --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest/63.patch @@ -0,0 +1,180 @@ +Upstream-Status: Submitted [https://github.com/cpprest-lts/cpprestsdk/pull/63] +From 80b15041c4001a8f49fe556b835e2781d54a7f69 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Fri, 13 Nov 2026 13:34:16 +0100 +Subject: [PATCH] Fix Base64 encoding and decoding on big-endian systems + +Replace implementation-defined bitfields with explicit byte shifts. +--- + Release/src/utilities/base64.cpp | 87 +++++++------------------------- + 1 file changed, 17 insertions(+), 70 deletions(-) + +diff --git a/Release/src/utilities/base64.cpp b/Release/src/utilities/base64.cpp +index 1cb235c3b5..9038278d22 100644 +--- a/Release/src/utilities/base64.cpp ++++ b/Release/src/utilities/base64.cpp +@@ -43,30 +43,6 @@ const std::array _base64_dectbl = { + 23, 24, 25, 255, 255, 255, 255, 255, 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 255, 255, 255, 255, 255}}; + +-struct _triple_byte +-{ +- unsigned char _1_1 : 2; +- unsigned char _0 : 6; +- unsigned char _2_1 : 4; +- unsigned char _1_2 : 4; +- unsigned char _3 : 6; +- unsigned char _2_2 : 2; +-}; +- +-struct _double_byte +-{ +- unsigned char _1_1 : 2; +- unsigned char _0 : 6; +- unsigned char _2_1 : 4; +- unsigned char _1_2 : 4; +-}; +- +-struct _single_byte +-{ +- unsigned char _1_1 : 2; +- unsigned char _0 : 6; +-}; +- + // + // A note on the implementation of BASE64 encoding and decoding: + // +@@ -75,10 +51,6 @@ struct _single_byte + // ignoring CRLF, relaxed validation rules, etc. The decoder is currently pretty strict. + // + +-#ifdef __GNUC__ +-// gcc is concerned about the bitfield uses in the code, something we simply need to ignore. +-#pragma GCC diagnostic ignored "-Wconversion" +-#endif + std::vector _from_base64(const utility::string_t& input) + { + std::vector result; +@@ -134,26 +106,14 @@ std::vector _from_base64(const utility::string_t& input) + size_t idx = 0; + for (; size > 4; ++idx) + { +- unsigned char target[3]; +- memset(target, 0, sizeof(target)); +- _triple_byte* record = reinterpret_cast<_triple_byte*>(target); +- + unsigned char val0 = _base64_dectbl[ptr[0]]; + unsigned char val1 = _base64_dectbl[ptr[1]]; + unsigned char val2 = _base64_dectbl[ptr[2]]; + unsigned char val3 = _base64_dectbl[ptr[3]]; + +- record->_0 = val0; +- record->_1_1 = val1 >> 4; +- result[idx] = target[0]; +- +- record->_1_2 = val1 & 0xF; +- record->_2_1 = val2 >> 2; +- result[++idx] = target[1]; +- +- record->_2_2 = val2 & 0x3; +- record->_3 = val3 & 0x3F; +- result[++idx] = target[2]; ++ result[idx] = static_cast((val0 << 2) | (val1 >> 4)); ++ result[++idx] = static_cast((val1 << 4) | (val2 >> 2)); ++ result[++idx] = static_cast((val2 << 6) | val3); + + ptr += 4; + size -= 4; +@@ -163,45 +123,35 @@ std::vector _from_base64(const utility::string_t& input) + // in all the iterations (a performance issue). + + { +- unsigned char target[3]; +- memset(target, 0, sizeof(target)); +- _triple_byte* record = reinterpret_cast<_triple_byte*>(target); +- + unsigned char val0 = _base64_dectbl[ptr[0]]; + unsigned char val1 = _base64_dectbl[ptr[1]]; + unsigned char val2 = _base64_dectbl[ptr[2]]; + unsigned char val3 = _base64_dectbl[ptr[3]]; + +- record->_0 = val0; +- record->_1_1 = val1 >> 4; +- result[idx] = target[0]; ++ result[idx] = static_cast((val0 << 2) | (val1 >> 4)); + +- record->_1_2 = val1 & 0xF; + if (val2 != 254) + { +- record->_2_1 = val2 >> 2; +- result[++idx] = target[1]; ++ result[++idx] = static_cast((val1 << 4) | (val2 >> 2)); + } + else + { + // There shouldn't be any information (ones) in the unused bits, +- if (record->_1_2 != 0) ++ if ((val1 & 0xF) != 0) + { + throw std::runtime_error("Invalid end of base64 string"); + } + return result; + } + +- record->_2_2 = val2 & 0x3; + if (val3 != 254) + { +- record->_3 = val3 & 0x3F; +- result[++idx] = target[2]; ++ result[++idx] = static_cast((val2 << 6) | val3); + } + else + { + // There shouldn't be any information (ones) in the unused bits. +- if (record->_2_2 != 0) ++ if ((val2 & 0x3) != 0) + { + throw std::runtime_error("Invalid end of base64 string"); + } +@@ -218,11 +168,10 @@ utility::string_t _to_base64(const unsigned char* ptr, size_t size) + + for (; size >= 3;) + { +- const _triple_byte* record = reinterpret_cast(ptr); +- unsigned char idx0 = record->_0; +- unsigned char idx1 = (record->_1_1 << 4) | record->_1_2; +- unsigned char idx2 = (record->_2_1 << 2) | record->_2_2; +- unsigned char idx3 = record->_3; ++ unsigned char idx0 = static_cast(ptr[0] >> 2); ++ unsigned char idx1 = static_cast(((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)); ++ unsigned char idx2 = static_cast(((ptr[1] & 0xF) << 2) | (ptr[2] >> 6)); ++ unsigned char idx3 = static_cast(ptr[2] & 0x3F); + result.push_back(char_t(_base64_enctbl[idx0])); + result.push_back(char_t(_base64_enctbl[idx1])); + result.push_back(char_t(_base64_enctbl[idx2])); +@@ -234,9 +183,8 @@ utility::string_t _to_base64(const unsigned char* ptr, size_t size) + { + case 1: + { +- const _single_byte* record = reinterpret_cast(ptr); +- unsigned char idx0 = record->_0; +- unsigned char idx1 = (record->_1_1 << 4); ++ unsigned char idx0 = static_cast(ptr[0] >> 2); ++ unsigned char idx1 = static_cast((ptr[0] & 0x3) << 4); + result.push_back(char_t(_base64_enctbl[idx0])); + result.push_back(char_t(_base64_enctbl[idx1])); + result.push_back('='); +@@ -245,10 +193,9 @@ utility::string_t _to_base64(const unsigned char* ptr, size_t size) + } + case 2: + { +- const _double_byte* record = reinterpret_cast(ptr); +- unsigned char idx0 = record->_0; +- unsigned char idx1 = (record->_1_1 << 4) | record->_1_2; +- unsigned char idx2 = (record->_2_1 << 2); ++ unsigned char idx0 = static_cast(ptr[0] >> 2); ++ unsigned char idx1 = static_cast(((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)); ++ unsigned char idx2 = static_cast((ptr[1] & 0xF) << 2); + result.push_back(char_t(_base64_enctbl[idx0])); + result.push_back(char_t(_base64_enctbl[idx1])); + result.push_back(char_t(_base64_enctbl[idx2])); diff --git a/meta-oe/recipes-support/cpprest/cpprest/64.patch b/meta-oe/recipes-support/cpprest/cpprest/64.patch new file mode 100644 index 0000000000..b02db9e024 --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest/64.patch @@ -0,0 +1,182 @@ +Upstream-Status: Submitted [https://github.com/cpprest-lts/cpprestsdk/pull/64] +From 3d7f0bddff0971970b7692d86ee14873c0bc1755 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Fri, 13 Nov 2026 13:46:50 +0100 +Subject: [PATCH] Add CMake option to skip network-dependent tests + +--- + Release/CMakeLists.txt | 7 ++++++- + Release/tests/common/TestRunner/test_runner.cpp | 5 +++++ + .../tests/functional/http/client/CMakeLists.txt | 2 +- + .../http/client/authentication_tests.cpp | 4 ++-- + .../http/client/connections_and_errors.cpp | 2 +- + .../tests/functional/http/client/outside_tests.cpp | 14 +++++++------- + Release/tests/functional/websockets/CMakeLists.txt | 2 +- + 7 files changed, 23 insertions(+), 13 deletions(-) + +diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt +index 9fc12840e..46a80aaf8 100644 +--- a/Release/CMakeLists.txt ++++ b/Release/CMakeLists.txt +@@ -18,6 +18,7 @@ enable_testing() + set(WERROR ON CACHE BOOL "Treat Warnings as Errors.") + set(CPPREST_EXCLUDE_WEBSOCKETS OFF CACHE BOOL "Exclude websockets functionality.") + set(CPPREST_EXCLUDE_COMPRESSION OFF CACHE BOOL "Exclude compression functionality.") ++set(CPPREST_TEST_NETWORK ON CACHE BOOL "Run tests requiring external network access.") + set(CPPREST_EXCLUDE_BROTLI ON CACHE BOOL "Exclude Brotli compression functionality.") + set(CPPREST_EXPORT_DIR cmake/cpprestsdk CACHE STRING "Directory to install CMake config files.") + set(CPPREST_INSTALL_HEADERS ON CACHE BOOL "Install header files.") +@@ -255,10 +256,14 @@ function(add_casablanca_test NAME SOURCES_VAR) + # so that they share one exception table and catch the wrong exception + target_link_libraries(${NAME} PRIVATE -Wl,-no_deduplicate) + endif() ++ set(_test_runner_args) ++ if(NOT CPPREST_TEST_NETWORK) ++ list(APPEND _test_runner_args /skip-network) ++ endif() + if (BUILD_SHARED_LIBS) + add_test(NAME ${NAME} + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} +- COMMAND test_runner $ ++ COMMAND test_runner ${_test_runner_args} $ + ) + endif() + endif() +diff --git a/Release/tests/common/TestRunner/test_runner.cpp b/Release/tests/common/TestRunner/test_runner.cpp +index abd280c6d..c9f710fb5 100644 +--- a/Release/tests/common/TestRunner/test_runner.cpp ++++ b/Release/tests/common/TestRunner/test_runner.cpp +@@ -268,6 +268,11 @@ static bool matched_properties(const UnitTest::TestProperties& test_props) + #endif + #endif + ++ if (UnitTest::GlobalSettings::Has("skip-network") && test_props.Has("NetworkRequired")) ++ { ++ return false; ++ } ++ + // The 'Require' property on a test case is special. + // It requires a certain global setting to be fulfilled to execute. + if (test_props.Has("Requires")) +diff --git a/Release/tests/functional/http/client/CMakeLists.txt b/Release/tests/functional/http/client/CMakeLists.txt +index e21242a5c..d50a839c4 100644 +--- a/Release/tests/functional/http/client/CMakeLists.txt ++++ b/Release/tests/functional/http/client/CMakeLists.txt +@@ -27,7 +27,7 @@ set(SOURCES + ) + + add_casablanca_test(httpclient_test SOURCES) +-if(BUILD_SHARED_LIBS) ++if(BUILD_SHARED_LIBS AND CPPREST_TEST_NETWORK) + add_test(NAME httpclient_test_badssl + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + COMMAND test_runner /badssl /select:@Requires=badssl $ +diff --git a/Release/tests/functional/http/client/authentication_tests.cpp b/Release/tests/functional/http/client/authentication_tests.cpp +index c90046be3..b857a43bc 100644 +--- a/Release/tests/functional/http/client/authentication_tests.cpp ++++ b/Release/tests/functional/http/client/authentication_tests.cpp +@@ -676,9 +676,9 @@ SUITE(authentication_tests) + VERIFY_ARE_EQUAL(return_code, response.status_code()); + } + +- TEST(auth_no_data) { auth_test_impl(false); } ++ TEST(auth_no_data, "NetworkRequired", "true") { auth_test_impl(false); } + +- TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } ++ TEST(unsuccessful_auth_with_basic_cred, "NetworkRequired", "true") { auth_test_impl(true); } + + TEST_FIXTURE(uri_address, set_user_options_asio_http) + { +diff --git a/Release/tests/functional/http/client/connections_and_errors.cpp b/Release/tests/functional/http/client/connections_and_errors.cpp +index 26a3b33e3..8b8b10e60 100644 +--- a/Release/tests/functional/http/client/connections_and_errors.cpp ++++ b/Release/tests/functional/http/client/connections_and_errors.cpp +@@ -409,7 +409,7 @@ SUITE(connections_and_errors) + #endif + + // Try to connect to a server on a closed port and cancel the operation. +- TEST_FIXTURE(uri_address, cancel_bad_port) ++ TEST_FIXTURE(uri_address, cancel_bad_port, "NetworkRequired", "true") + { + // http_client_asio had a bug where, when canceled, it would cancel only the + // current connection but then go and try the next address from the list of +diff --git a/Release/tests/functional/http/client/outside_tests.cpp b/Release/tests/functional/http/client/outside_tests.cpp +index b8147b1f8..29551a43c 100644 +--- a/Release/tests/functional/http/client/outside_tests.cpp ++++ b/Release/tests/functional/http/client/outside_tests.cpp +@@ -41,7 +41,7 @@ namespace client + { + SUITE(outside_tests) + { +- TEST_FIXTURE(uri_address, outside_cnn_dot_com) ++ TEST_FIXTURE(uri_address, outside_cnn_dot_com, "NetworkRequired", "true") + { + handle_timeout([] { + // http://www.cnn.com redirects users from countries outside of the US to the "http://edition.cnn.com/" drop +@@ -60,7 +60,7 @@ SUITE(outside_tests) + }); + } + +- TEST_FIXTURE(uri_address, outside_wikipedia_compressed_http_response) ++ TEST_FIXTURE(uri_address, outside_wikipedia_compressed_http_response, "NetworkRequired", "true") + { + if (web::http::compression::builtin::supported() == false) + { +@@ -86,7 +86,7 @@ SUITE(outside_tests) + VERIFY_ARE_EQUAL(encoding, U("gzip")); + } + +- TEST_FIXTURE(uri_address, outside_google_dot_com) ++ TEST_FIXTURE(uri_address, outside_google_dot_com, "NetworkRequired", "true") + { + // Use code.google.com instead of www.google.com, which redirects + http_client client(U("http://code.google.com")); +@@ -98,7 +98,7 @@ SUITE(outside_tests) + } + } + +- TEST_FIXTURE(uri_address, multiple_https_requests) ++ TEST_FIXTURE(uri_address, multiple_https_requests, "NetworkRequired", "true") + { + handle_timeout([&] { + // Use code.google.com instead of www.google.com, which redirects +@@ -115,7 +115,7 @@ SUITE(outside_tests) + } + + #if (defined(_MSC_VER) && (_MSC_VER >= 1900)) && !CPPREST_FORCE_PPLX +- TEST_FIXTURE(uri_address, multiple_https_requests_sync_scheduler) ++ TEST_FIXTURE(uri_address, multiple_https_requests_sync_scheduler, "NetworkRequired", "true") + { + struct sync_scheduler : public scheduler_interface + { +@@ -148,7 +148,7 @@ SUITE(outside_tests) + } + #endif + +- TEST_FIXTURE(uri_address, reading_google_stream) ++ TEST_FIXTURE(uri_address, reading_google_stream, "NetworkRequired", "true") + { + handle_timeout([&] { + // Use code.google.com instead of www.google.com, which redirects +@@ -170,7 +170,7 @@ SUITE(outside_tests) + }); + } + +- TEST_FIXTURE(uri_address, no_transfer_encoding_content_length) ++ TEST_FIXTURE(uri_address, no_transfer_encoding_content_length, "NetworkRequired", "true") + { + handle_timeout([] { + http_client client(U("http://ws.audioscrobbler.com/2.0/") U( +diff --git a/Release/tests/functional/websockets/CMakeLists.txt b/Release/tests/functional/websockets/CMakeLists.txt +index 9a33589f5..ab7926c22 100644 +--- a/Release/tests/functional/websockets/CMakeLists.txt ++++ b/Release/tests/functional/websockets/CMakeLists.txt +@@ -28,7 +28,7 @@ if (NOT CPPREST_EXCLUDE_WEBSOCKETS) + ) + + add_casablanca_test(websocketsclient_test SOURCES) +- if(BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS AND CPPREST_TEST_NETWORK) + add_test(NAME websocketsclient_test_badssl + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + COMMAND test_runner /badssl /select:@Requires=badssl $ diff --git a/meta-oe/recipes-support/cpprest/cpprest/65.patch b/meta-oe/recipes-support/cpprest/cpprest/65.patch new file mode 100644 index 0000000000..cd80d6a95d --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest/65.patch @@ -0,0 +1,94 @@ +Upstream-Status: Submitted [https://github.com/cpprest-lts/cpprestsdk/pull/65] +From 95a56289b4f4c38357b77bdeec5f68e3443209a9 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Fri, 13 Nov 2026 23:05:48 +0100 +Subject: [PATCH] Fix single-character file reads on big-endian systems + +--- + Release/include/cpprest/filestream.h | 12 ++++++------ + .../tests/functional/streams/fstreambuf_tests.cpp | 14 ++++++++++++++ + 2 files changed, 20 insertions(+), 6 deletions(-) + +diff --git a/Release/include/cpprest/filestream.h b/Release/include/cpprest/filestream.h +index da7743d89..2091503b6 100644 +--- a/Release/include/cpprest/filestream.h ++++ b/Release/include/cpprest/filestream.h +@@ -399,7 +399,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + { + pplx::extensibility::scoped_recursive_lock_t lck(m_info->m_lock); + m_info->m_rdpos += 1; +- _CharType ch1 = (_CharType)callback->m_ch; ++ int_type ch1 = static_cast(std::char_traits<_CharType>::to_int_type(callback->m_ch)); + delete callback; + return pplx::task_from_result(ch1); + } +@@ -453,7 +453,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + if (ch == sizeof(_CharType)) + { + pplx::extensibility::scoped_recursive_lock_t lck(m_info->m_lock); +- _CharType ch1 = (_CharType)callback->m_ch; ++ int_type ch1 = static_cast(std::char_traits<_CharType>::to_int_type(callback->m_ch)); + delete callback; + return pplx::task_from_result(ch1); + } +@@ -874,7 +874,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + if (result == sizeof(_CharType)) + { + m_info->m_rdpos += 1; +- m_op.set(m_ch); ++ m_op.set(static_cast(std::char_traits<_CharType>::to_int_type(m_ch))); + } + else + { +@@ -889,7 +889,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + delete this; + } + +- int_type m_ch; ++ _CharType m_ch; + + private: + _file_info* m_info; +@@ -908,7 +908,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + { + if (result == sizeof(_CharType)) + { +- m_op.set(m_ch); ++ m_op.set(static_cast(std::char_traits<_CharType>::to_int_type(m_ch))); + } + else + { +@@ -917,7 +917,7 @@ class basic_file_buffer : public details::streambuf_state_manager<_CharType> + delete this; + } + +- int_type m_ch; ++ _CharType m_ch; + + virtual void on_error(const std::exception_ptr& e) + { +diff --git a/Release/tests/functional/streams/fstreambuf_tests.cpp b/Release/tests/functional/streams/fstreambuf_tests.cpp +index bd6363309..9b38eaa99 100644 +--- a/Release/tests/functional/streams/fstreambuf_tests.cpp ++++ b/Release/tests/functional/streams/fstreambuf_tests.cpp +@@ -305,6 +305,20 @@ SUITE(file_buffer_tests) + VERIFY_IS_FALSE(stream.is_open()); + } + ++ TEST(ReadSingleChar_full_value) ++ { ++ utility::string_t fname = U("ReadSingleChar_full_value.txt"); ++ fill_file(fname); ++ ++ auto peekStream = OPEN_R(fname).get(); ++ VERIFY_ARE_EQUAL('a', peekStream.getc().get()); ++ peekStream.close().get(); ++ ++ auto readStream = OPEN_R(fname).get(); ++ VERIFY_ARE_EQUAL('a', readStream.bumpc().get()); ++ readStream.close().get(); ++ } ++ + TEST(SequentialReadWrite) + { + utility::string_t fname = U("SequentialReadWrite.txt"); diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch deleted file mode 100644 index b956db22fd..0000000000 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-float-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream-Status: Pending - -Description: new toolchain might have increased the float precision -Author: Gianfranco Costamagna -Last-Update: 2017-10-28 -Forwarded: https://github.com/Microsoft/cpprestsdk/issues/576 - -Index: cpprest/Release/tests/functional/streams/istream_tests.cpp -=================================================================== ---- cpprest.orig/Release/tests/functional/streams/istream_tests.cpp -+++ cpprest/Release/tests/functional/streams/istream_tests.cpp -@@ -1297,6 +1297,7 @@ - void compare_double(double expected, double actual) { compare_floating(expected, actual, DBL_EPSILON); } - void compare_float(float expected, float actual) { compare_floating(expected, actual, FLT_EPSILON); } - -+ /* - TEST(extract_floating_point) - { - std::string test_string; -@@ -1343,6 +1344,7 @@ - if (expected == 0) VERIFY_ARE_EQUAL(1 / expected, 1 / actual); - } while (!std_istream.eof()); - } -+ */ - - TEST(extract_floating_point_with_exceptions) - { diff --git a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch b/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch deleted file mode 100644 index 961eaf7646..0000000000 --- a/meta-oe/recipes-support/cpprest/cpprest/disable-outside-tests.patch +++ /dev/null @@ -1,129 +0,0 @@ -Upstream-Status: Pending - -Description: Debian forbids calls to external websites. - -Author: Gianfranco Costamagna -Origin: Debian -Forwarded: not-needed -Reviewed-By: Gianfranco Costamagna -Last-Update: 2015-11-25 - -Index: cpprest/Release/tests/functional/http/client/CMakeLists.txt -=================================================================== ---- cpprest.orig/Release/tests/functional/http/client/CMakeLists.txt -+++ cpprest/Release/tests/functional/http/client/CMakeLists.txt -@@ -12,7 +12,6 @@ - multiple_requests.cpp - oauth1_tests.cpp - oauth2_tests.cpp -- outside_tests.cpp - pipeline_stage_tests.cpp - progress_handler_tests.cpp - proxy_tests.cpp -Index: cpprest/Release/tests/functional/http/client/authentication_tests.cpp -=================================================================== ---- cpprest.orig/Release/tests/functional/http/client/authentication_tests.cpp -+++ cpprest/Release/tests/functional/http/client/authentication_tests.cpp -@@ -675,9 +675,9 @@ - VERIFY_ARE_EQUAL(return_code, response.status_code()); - } - -- TEST(auth_no_data) { auth_test_impl(false); } -+ //TEST(auth_no_data) { auth_test_impl(false); } - -- TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } -+ //TEST(unsuccessful_auth_with_basic_cred) { auth_test_impl(true); } - - TEST_FIXTURE(uri_address, set_user_options_asio_http) - { -@@ -695,6 +695,7 @@ - VERIFY_ARE_EQUAL(200, response.status_code()); - } - -+ /* - TEST_FIXTURE(uri_address, set_user_options_asio_https) - { - handle_timeout([] { -@@ -714,6 +715,7 @@ - VERIFY_IS_FALSE(v.empty()); - }); - } -+ */ - - #endif - -Index: cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp -=================================================================== ---- cpprest.orig/Release/tests/functional/websockets/client/authentication_tests.cpp -+++ cpprest/Release/tests/functional/websockets/client/authentication_tests.cpp -@@ -93,6 +93,7 @@ SUITE(authentication_tests) - return false; - } - -+ /* - TEST(ssl_test) - { - websocket_client client; -@@ -127,6 +128,7 @@ SUITE(authentication_tests) - throw; - } - } -+ */ - - void handshake_error_test_impl(const ::utility::string_t& host) - { -@@ -148,11 +150,11 @@ SUITE(authentication_tests) - } - } - -- TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } -+ //TEST(self_signed_cert) { handshake_error_test_impl(U("wss://self-signed.badssl.com/")); } - -- TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } -+ //TEST(hostname_mismatch) { handshake_error_test_impl(U("wss://wrong.host.badssl.com/")); } - -- TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } -+ //TEST(cert_expired) { handshake_error_test_impl(U("wss://expired.badssl.com/")); } - - } // SUITE(authentication_tests) - -Index: cpprest/Release/tests/functional/http/client/connections_and_errors.cpp -=================================================================== ---- cpprest.orig/Release/tests/functional/http/client/connections_and_errors.cpp -+++ cpprest/Release/tests/functional/http/client/connections_and_errors.cpp -@@ -408,6 +408,7 @@ - } - #endif - -+ /* - // Try to connect to a server on a closed port and cancel the operation. - TEST_FIXTURE(uri_address, cancel_bad_port) - { -@@ -439,6 +440,7 @@ - - VERIFY_THROWS_HTTP_ERROR_CODE(t.get(), std::errc::operation_canceled); - } -+ */ - - } // SUITE(connections_and_errors) - ---- cpprest-2.10.16.orig/Release/tests/functional/http/client/redirect_tests.cpp -+++ cpprest-2.10.16/Release/tests/functional/http/client/redirect_tests.cpp -@@ -159,7 +159,7 @@ SUITE(redirect_tests) - VERIFY_NO_THROWS(reply.get()); - } - } -- -+/* - TEST(does_not_follow_https_to_http_by_default) - { - handle_timeout([] { -@@ -182,7 +182,7 @@ SUITE(redirect_tests) - ); - }); - } -- -+*/ - TEST_FIXTURE(uri_address, follows_permanent_redirect) - { - #if USING_WINHTTP diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.20+cpprest-lts.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.20+cpprest-lts.bb new file mode 100644 index 0000000000..f8af506f4d --- /dev/null +++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.20+cpprest-lts.bb @@ -0,0 +1,18 @@ +SUMMARY = "Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design." +SECTION = "libs/network" +HOMEPAGE = "https://github.com/cpprest-lts/cpprestsdk/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${S}/license.txt;md5=a2e15b954769218ff912468eecd6a02f" +DEPENDS = "openssl websocketpp zlib boost brotli" + +EXTRA_OECMAKE = "-DCPPREST_EXPORT_DIR=cmake/cpprestsdk -DCPPREST_EXCLUDE_BROTLI=OFF -DWERROR=OFF -DCPPREST_TEST_NETWORK=OFF" + +SRC_URI = "git://github.com/cpprest-lts/cpprestsdk.git;protocol=https;branch=cpprest-lts \ + file://63.patch \ + file://64.patch \ + file://65.patch " + +# tag 2.10.20+cpprest-lts +SRCREV = "feadb5b7d01a09d124d6d6c7bfeee648c15b37d1" + +inherit cmake pkgconfig