From 2bab31b0ab987688a283c802be939f6c68c74773 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 25 Oct 2025 15:04:20 +0200 Subject: Fix build on Arch with boost 1.89. --- wscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 4cc7382..939b117 100644 --- a/wscript +++ b/wscript @@ -77,13 +77,19 @@ def configure(conf): conf.check_cfg(package='libxml++-' + conf.env.XMLPP_API, args='--cflags --libs', uselib_store='LIBXML++', mandatory=True) + boost_system = conf.check_cxx(lib='boost_system%s' % boost_lib_suffix, mandatory=False) + def boost_libs(name): + libs = ['boost_system%s' % boost_lib_suffix] if boost_system else [] + libs.append('boost_%s%s' % (name, boost_lib_suffix)) + return libs + conf.check_cxx(fragment=""" #include \n int main() { boost::filesystem::copy_file ("a", "b"); }\n """, msg='Checking for boost filesystem library', libpath='/usr/local/lib', - lib=['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + lib=boost_libs('filesystem'), uselib_store='BOOST_FILESYSTEM') if not conf.options.disable_tests: @@ -93,7 +99,7 @@ def configure(conf): BOOST_AUTO_TEST_CASE(foo) {} """, msg='Checking for boost unit testing library', - lib=['boost_unit_test_framework%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + lib=boost_libs('unit_test_framework'), uselib_store='BOOST_TEST') conf.recurse('test') -- cgit v1.2.3