summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/event_service_store.hpp2
-rw-r--r--meson.build20
-rw-r--r--redfish-core/include/event_service_manager.hpp2
-rw-r--r--redfish-core/include/redfish_aggregator.hpp2
-rw-r--r--redfish-core/include/utils/telemetry_utils.hpp2
-rw-r--r--redfish-core/lib/certificate_service.hpp2
-rw-r--r--redfish-core/lib/ethernet.hpp2
-rw-r--r--redfish-core/lib/event_service.hpp2
-rw-r--r--redfish-core/lib/trigger.hpp4
-rw-r--r--redfish-core/lib/virtual_media.hpp4
-rw-r--r--src/boost_url.cpp2
-rw-r--r--subprojects/boost.wrap10
-rw-r--r--subprojects/packagefiles/boost/meson.build9
-rw-r--r--test/http/utility_test.cpp2
14 files changed, 30 insertions, 35 deletions
diff --git a/include/event_service_store.hpp b/include/event_service_store.hpp
index 8b24fcbe83..522227b61c 100644
--- a/include/event_service_store.hpp
+++ b/include/event_service_store.hpp
@@ -49,7 +49,7 @@ struct UserSubscription
{
continue;
}
- boost::urls::result<boost::urls::url> url =
+ boost::system::result<boost::urls::url> url =
boost::urls::parse_absolute_uri(*value);
if (!url)
{
diff --git a/meson.build b/meson.build
index 4aa7c330a9..401b5964d3 100644
--- a/meson.build
+++ b/meson.build
@@ -237,6 +237,7 @@ endif
add_project_arguments(
cxx.get_supported_arguments([
+ '-DBOOST_ASIO_DISABLE_CONCEPTS',
'-DBOOST_ALL_NO_LIB',
'-DBOOST_ALLOW_DEPRECATED_HEADERS',
'-DBOOST_ASIO_DISABLE_THREADS',
@@ -306,12 +307,20 @@ if not nlohmann_json.found()
endif
bmcweb_dependencies += nlohmann_json
-boost = dependency('boost',version : '>=1.82.0', required : false, include_type: 'system')
-if not boost.found()
- boost = subproject('boost', required: true).get_variable('boost_dep')
- boost = boost.as_system('system')
+boost = dependency('boost', modules: ['url'], version : '>=1.83.0', required : false, include_type: 'system')
+if boost.found()
+ bmcweb_dependencies += [boost]
+else
+ cmake = import('cmake')
+ opt = cmake.subproject_options()
+ opt.add_cmake_defines({
+ 'BOOST_INCLUDE_LIBRARIES': 'url'
+ })
+ boost = cmake.subproject('boost', required: true, options: opt)
+ boost_url = boost.dependency('boost_url').as_system()
+ boost_headers = boost.dependency('boost_headers').as_system()
+ bmcweb_dependencies += [boost_url, boost_headers]
endif
-bmcweb_dependencies += boost
if get_option('tests').enabled()
gtest = dependency('gtest', main: true, disabler: true, required : false)
@@ -353,7 +362,6 @@ srcfiles_bmcweb = files(
'src/boost_asio_ssl.cpp',
'src/boost_asio.cpp',
'src/boost_beast.cpp',
- 'src/boost_url.cpp',
'src/dbus_singleton.cpp',
'src/json_html_serializer.cpp',
'src/ossl_random.cpp',
diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp
index ed02c409eb..5ea30df8ee 100644
--- a/redfish-core/include/event_service_manager.hpp
+++ b/redfish-core/include/event_service_manager.hpp
@@ -642,7 +642,7 @@ class EventServiceManager
std::shared_ptr<persistent_data::UserSubscription> newSub =
it.second;
- boost::urls::result<boost::urls::url> url =
+ boost::system::result<boost::urls::url> url =
boost::urls::parse_absolute_uri(newSub->destinationUrl);
if (!url)
diff --git a/redfish-core/include/redfish_aggregator.hpp b/redfish-core/include/redfish_aggregator.hpp
index e5ad88abe1..5df43a6b36 100644
--- a/redfish-core/include/redfish_aggregator.hpp
+++ b/redfish-core/include/redfish_aggregator.hpp
@@ -80,7 +80,7 @@ inline bool searchCollectionsArray(std::string_view uri,
parseCount--;
}
- boost::urls::result<boost::urls::url_view> parsedUrl =
+ boost::system::result<boost::urls::url_view> parsedUrl =
boost::urls::parse_relative_ref(
uri.substr(serviceRootUri.size(), parseCount));
if (!parsedUrl)
diff --git a/redfish-core/include/utils/telemetry_utils.hpp b/redfish-core/include/utils/telemetry_utils.hpp
index c5c88fa4e5..ac1411c7d7 100644
--- a/redfish-core/include/utils/telemetry_utils.hpp
+++ b/redfish-core/include/utils/telemetry_utils.hpp
@@ -66,7 +66,7 @@ inline std::optional<IncorrectMetricUri> getChassisSensorNode(
size_t uriIdx = 0;
for (const std::string& uri : uris)
{
- boost::urls::result<boost::urls::url_view> parsed =
+ boost::system::result<boost::urls::url_view> parsed =
boost::urls::parse_relative_ref(uri);
if (!parsed)
diff --git a/redfish-core/lib/certificate_service.hpp b/redfish-core/lib/certificate_service.hpp
index 44005966c7..10931c4f47 100644
--- a/redfish-core/lib/certificate_service.hpp
+++ b/redfish-core/lib/certificate_service.hpp
@@ -505,7 +505,7 @@ inline void handleReplaceCertificateAction(
}
BMCWEB_LOG_INFO("Certificate URI to replace: {}", certURI);
- boost::urls::result<boost::urls::url> parsedUrl =
+ boost::system::result<boost::urls::url> parsedUrl =
boost::urls::parse_relative_ref(certURI);
if (!parsedUrl)
{
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 0f35f7ed06..bd446771cb 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -1872,7 +1872,7 @@ inline void requestEthernetInterfacesRoutes(App& app)
}
BMCWEB_LOG_INFO("Parent Interface URI: {}", parentInterfaceUri);
- boost::urls::result<boost::urls::url_view> parsedUri =
+ boost::system::result<boost::urls::url_view> parsedUri =
boost::urls::parse_relative_ref(parentInterfaceUri);
if (!parsedUri)
{
diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp
index 89c233702f..c1ad0d8022 100644
--- a/redfish-core/lib/event_service.hpp
+++ b/redfish-core/lib/event_service.hpp
@@ -318,7 +318,7 @@ inline void requestRoutesEventDestinationCollection(App& app)
}
}
- boost::urls::result<boost::urls::url> url =
+ boost::system::result<boost::urls::url> url =
boost::urls::parse_absolute_uri(destUrl);
if (!url)
{
diff --git a/redfish-core/lib/trigger.hpp b/redfish-core/lib/trigger.hpp
index 48e348ec60..3388580cdc 100644
--- a/redfish-core/lib/trigger.hpp
+++ b/redfish-core/lib/trigger.hpp
@@ -246,7 +246,7 @@ struct Context
inline std::optional<sdbusplus::message::object_path>
getReportPathFromReportDefinitionUri(const std::string& uri)
{
- boost::urls::result<boost::urls::url_view> parsed =
+ boost::system::result<boost::urls::url_view> parsed =
boost::urls::parse_relative_ref(uri);
if (!parsed)
@@ -543,7 +543,7 @@ inline bool parseMetricProperties(crow::Response& res, Context& ctx)
size_t uriIdx = 0;
for (const std::string& uriStr : *ctx.metricProperties)
{
- boost::urls::result<boost::urls::url_view> uri =
+ boost::system::result<boost::urls::url_view> uri =
boost::urls::parse_relative_ref(uriStr);
if (!uri)
{
diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
index d854ee53b6..95cbdf146f 100644
--- a/redfish-core/lib/virtual_media.hpp
+++ b/redfish-core/lib/virtual_media.hpp
@@ -128,7 +128,7 @@ inline void
*/
inline std::string getTransferProtocolTypeFromUri(const std::string& imageUri)
{
- boost::urls::result<boost::urls::url_view> url =
+ boost::system::result<boost::urls::url_view> url =
boost::urls::parse_uri(imageUri);
if (!url)
{
@@ -553,7 +553,7 @@ inline void validateParams(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
return;
}
- boost::urls::result<boost::urls::url_view> url =
+ boost::system::result<boost::urls::url_view> url =
boost::urls::parse_uri(*actionParams.imageUrl);
if (!url)
{
diff --git a/src/boost_url.cpp b/src/boost_url.cpp
deleted file mode 100644
index 95ec218eb5..0000000000
--- a/src/boost_url.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <boost/url/src.hpp>
diff --git a/subprojects/boost.wrap b/subprojects/boost.wrap
index a25e9f1fab..2e6b7d1da4 100644
--- a/subprojects/boost.wrap
+++ b/subprojects/boost.wrap
@@ -1,11 +1,9 @@
[wrap-file]
-directory = boost_1_82_0
+directory = boost-1.83.0
-source_url = https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2
-source_hash = a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6
-source_filename = 1_82_0.tar.bz2
-
-patch_directory = boost
+source_url = https://github.com/boostorg/boost/releases/download/boost-1.83.0/boost-1.83.0.tar.gz
+source_hash = 0c6049764e80aa32754acd7d4f179fd5551d8172a83b71532ae093e7384e98da
+source_filename = 1_83_0.tar.gz
[provide]
boost = boost_dep
diff --git a/subprojects/packagefiles/boost/meson.build b/subprojects/packagefiles/boost/meson.build
deleted file mode 100644
index 9a9c2c5dc7..0000000000
--- a/subprojects/packagefiles/boost/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-project('boost',
- 'cpp',
- version : '1.80.0',
- license : 'Boost'
-)
-
-boost_dep = declare_dependency(
- include_directories : include_directories('.'),
-)
diff --git a/test/http/utility_test.cpp b/test/http/utility_test.cpp
index cf83410707..cc21bbcf2f 100644
--- a/test/http/utility_test.cpp
+++ b/test/http/utility_test.cpp
@@ -83,7 +83,7 @@ TEST(Utility, Base64EncodeDecodeString)
TEST(Utility, readUrlSegments)
{
- boost::urls::result<boost::urls::url_view> parsed =
+ boost::system::result<boost::urls::url_view> parsed =
boost::urls::parse_relative_ref("/redfish/v1/Chassis#/Fans/0/Reading");
EXPECT_TRUE(readUrlSegments(*parsed, "redfish", "v1", "Chassis"));
generated by cgit v1.2.3 (git 2.39.0) at 2024-06-18 14:58:33 +0300