Skip to content

Commit

Permalink
Add back rtti
Browse files Browse the repository at this point in the history
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 <[email protected]>
Change-Id: Id86a6358dc5a73a8b5e386661f9317f24cdbe21c
  • Loading branch information
edtanous committed Feb 17, 2021
1 parent 28aa8de commit 65f7365
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ project('bmcweb', 'cpp',
'buildtype=debugoptimized',
'b_ndebug=if-release',
'b_lto=true',
# enable when https://github.com/chriskohlhoff/asio/issues/533
# is resolved. ASIO default executor doesn't build with no-rtti
#'cpp_rtti=false'
'cpp_rtti=false'
])

# Project related links
Expand Down Expand Up @@ -295,10 +293,10 @@ else
endif
bmcweb_dependencies += nlohmann_json

boost = dependency('boost',version : '>=1.73.0', required : false)
boost = dependency('boost',version : '>=1.75.0', required : false)
if not boost.found()
subproject('boost', required: false)
boost_inc = include_directories('subprojects/boost_1_73_0/', is_system:true)
boost_inc = include_directories('subprojects/boost_1_75_0/', is_system:true)
boost = declare_dependency(include_directories : boost_inc)
endif
bmcweb_dependencies += boost
Expand Down
6 changes: 3 additions & 3 deletions subprojects/boost.wrap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[wrap-file]
source_url = https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz
source_hash = 9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf
source_filename = boost_1_73_0.tar.gz
source_url = https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.gz
source_hash = aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
source_filename = boost_1_75_0.tar.gz

0 comments on commit 65f7365

Please sign in to comment.