From bf4ab157886b0ea79a72fef689a2347a43b7ae48 Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Mon, 20 Feb 2023 16:17:49 +0100 Subject: [PATCH] Avoid linking against tomlplusplus shared libs --- CHANGELOG.md | 4 ++++ meson.build | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10102ca9..1ece3c2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ Versioning](https://semver.org/spec/v2.0.0.html). - Configuring the Meson build now works correctly on Wine 8.0 final. Meson's version comparison function considers `8.0` to be a lower version than `8.0rc2`. +- The tomlplusplus dependency in the Meson build new avoids linking against + tomlplusplus' shared libraries. These were recently introduced, and depending + on the environment Meson may try to link them to the binaries even though the + library is used in headers only mode. ### Packaging notes diff --git a/meson.build b/meson.build index 500c9904..dc5bf3a0 100644 --- a/meson.build +++ b/meson.build @@ -265,7 +265,8 @@ dbus_dep = dependency('dbus-1').partial_dependency(compile_args : true, includes function2_dep = dependency('function2', version : '>=4.0.0') ghc_filesystem_dep = dependency('ghc_filesystem', modules : 'ghcFilesystem::ghc_filesystem', version : '>=1.5.0') threads_dep = dependency('threads') -tomlplusplus_dep = dependency('tomlplusplus', version : '>=2.0.0') +# Tomlplusplus recently added a shraed library version. We don't want to link to that. +tomlplusplus_dep = dependency('tomlplusplus', version : '>=3.0.0').partial_dependency(compile_args : true, includes : true) dl_dep = declare_dependency(link_args : '-ldl') rt_dep = declare_dependency(link_args : '-lrt')