From: Fred Morcos Date: Mon, 27 Nov 2023 10:18:15 +0000 (+0100) Subject: Meson: Define BOOST_CONTAINER_USE_STD_EXCEPTIONS on the command-line X-Git-Tag: rec-5.1.0-alpha1~80^2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6a5f4b8e85a2a340ba4a6b1127292dec60910f;p=thirdparty%2Fpdns.git Meson: Define BOOST_CONTAINER_USE_STD_EXCEPTIONS on the command-line This replaces the definition coming through config.h because boost container implementations seem to trip up on certain build configurations (e.g. debugoptimized). Additionally, it seems that when this is defined through config.h, boost does not export the symbols related to boost exceptions to the user but is perfectly happy to throw such exceptions. --- diff --git a/meson/boost/meson.build b/meson/boost/meson.build index 772708c41f..943f0c4d80 100644 --- a/meson/boost/meson.build +++ b/meson/boost/meson.build @@ -3,6 +3,7 @@ dep_boost = dependency('boost', version: '>= 1.42', required: true) # with C++11. have_boost_1_48_0 = dep_boost.version().version_compare('>= 1.48.0') conf.set('HAVE_BOOST_GE_148', have_boost_1_48_0, description: 'Boost version >= 1.48.0') -conf.set('BOOST_CONTAINER_USE_STD_EXCEPTIONS', true, description: 'Boost use std exceptions') +# conf.set('BOOST_CONTAINER_USE_STD_EXCEPTIONS', true, description: 'Boost use std exceptions') +add_project_arguments('-DBOOST_CONTAINER_USE_STD_EXCEPTIONS', language: ['c', 'cpp']) summary('Boost', dep_boost.found(), bool_yn: true, section: 'Boost') summary('Version', dep_boost.version(), section: 'Boost')