Skip to content

Commit 65f7365

Browse files
committed
Add back rtti
The bug mentioned in the comment has been resolved in boost 1.75. Reenable this to drop our binary size again. As a consequence of this, this commit also upgrades the subproject dependencies to 1.75 from 1.73. They technically weren't updated to 1.74, so I'm not sure if anyone really uses these anymore. Tested: Code builds with this enabled. Signed-off-by: Ed Tanous <edtanous@google.com> Change-Id: Id86a6358dc5a73a8b5e386661f9317f24cdbe21c
1 parent 28aa8de commit 65f7365

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

meson.build

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ project('bmcweb', 'cpp',
88
'buildtype=debugoptimized',
99
'b_ndebug=if-release',
1010
'b_lto=true',
11-
# enable when https://github.com/chriskohlhoff/asio/issues/533
12-
# is resolved. ASIO default executor doesn't build with no-rtti
13-
#'cpp_rtti=false'
11+
'cpp_rtti=false'
1412
])
1513

1614
# Project related links
@@ -295,10 +293,10 @@ else
295293
endif
296294
bmcweb_dependencies += nlohmann_json
297295

298-
boost = dependency('boost',version : '>=1.73.0', required : false)
296+
boost = dependency('boost',version : '>=1.75.0', required : false)
299297
if not boost.found()
300298
subproject('boost', required: false)
301-
boost_inc = include_directories('subprojects/boost_1_73_0/', is_system:true)
299+
boost_inc = include_directories('subprojects/boost_1_75_0/', is_system:true)
302300
boost = declare_dependency(include_directories : boost_inc)
303301
endif
304302
bmcweb_dependencies += boost

subprojects/boost.wrap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[wrap-file]
2-
source_url = https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz
3-
source_hash = 9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf
4-
source_filename = boost_1_73_0.tar.gz
2+
source_url = https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz
3+
source_hash = aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
4+
source_filename = boost_1_75_0.tar.gz

0 commit comments

Comments
 (0)