From dd2f9d0173b382d4d5262795563669abafeaa3cb Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 4 Jun 2024 13:35:25 +0200 Subject: [PATCH] auth geoipbackend meson: link C++ fs lib if needed --- meson/cxx-fs/meson.build | 4 ++-- modules/geoipbackend/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson/cxx-fs/meson.build b/meson/cxx-fs/meson.build index 38fdf963b5..6fdd3880f1 100644 --- a/meson/cxx-fs/meson.build +++ b/meson/cxx-fs/meson.build @@ -8,7 +8,7 @@ if get_option('module-geoip') != 'disabled' lib_cxx_fs = cxx.find_library('stdc++fs', disabler: true, required: false) if lib_cxx_fs.found() if cxx.links(prog, name: '-lstdc++fs is needed', dependencies: lib_cxx_fs) - need_cxx_fs = '-lstdc++fs' + need_cxx_fs = true dep_cxx_fs = declare_dependency(dependencies: lib_cxx_fs) summary('Filesystem library', lib_cxx_fs, section: 'System') endif @@ -18,7 +18,7 @@ if get_option('module-geoip') != 'disabled' lib_cxx_fs = cxx.find_library('c++fs', disabler: true, required: false) if lib_cxx_fs.found() if cxx.links(prog, name: '-lc++fs is needed', dependencies: lib_cxx_fs) - need_cxx_fs = '-lc++fs' + need_cxx_fs = true dep_cxx_fs = declare_dependency(dependencies: lib_cxx_fs) summary('Filesystem library', lib_cxx_fs, section: 'System') else diff --git a/modules/geoipbackend/meson.build b/modules/geoipbackend/meson.build index 673d923d39..769730de83 100644 --- a/modules/geoipbackend/meson.build +++ b/modules/geoipbackend/meson.build @@ -10,4 +10,4 @@ module_extras = files( 'geoipinterface.hh', ) -module_deps = [deps, dep_geoip, dep_mmdb, dep_yaml_cpp] +module_deps = [deps, dep_geoip, dep_mmdb, dep_yaml_cpp, dep_cxx_fs] -- 2.47.2