summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Tanous <edtanous@google.com>2021-02-17 21:20:27 +0300
committerEd Tanous <ed@tanous.net>2021-02-18 01:15:45 +0300
commit65f7365901fad2437456f4edcdac41e03f0ca259 (patch)
tree7acd5f7422da2db47fb789a9ae8b2c74776afd24
parent28aa8de5d3ad14db3aecfb10f5462d5bd4637717 (diff)
downloadbmcweb-65f7365901fad2437456f4edcdac41e03f0ca259.tar.xz
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
-rw-r--r--meson.build8
-rw-r--r--subprojects/boost.wrap6
2 files changed, 6 insertions, 8 deletions
diff --git a/meson.build b/meson.build
index 5eaa63c444..6dd903bb3f 100644
--- a/meson.build
+++ b/meson.build
@@ -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
@@ -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
diff --git a/subprojects/boost.wrap b/subprojects/boost.wrap
index 8e408fd627..36f111b038 100644
--- a/subprojects/boost.wrap
+++ b/subprojects/boost.wrap
@@ -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