From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 4 Jun 2024 11:35:25 +0000 (+0200)
Subject: auth geoipbackend meson: link C++ fs lib if needed
X-Git-Tag: rec-5.2.0-alpha0~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd2f9d0173b382d4d5262795563669abafeaa3cb;p=thirdparty%2Fpdns.git

auth geoipbackend meson: link C++ fs lib if needed
---

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]