]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
auth geoipbackend meson: link C++ fs lib if needed 14277/head
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 4 Jun 2024 11:35:25 +0000 (13:35 +0200)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 4 Jun 2024 11:35:25 +0000 (13:35 +0200)
meson/cxx-fs/meson.build
modules/geoipbackend/meson.build

index 38fdf963b565167dc5e4cfebb9fb3fd5258c3031..6fdd3880f1a555d4e7e32261591db0bac400e546 100644 (file)
@@ -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
index 673d923d3955ff5b20fd2db1cf00b8e3fec5a522..769730de83ffb60476a0b030bbee253c8ac2bae3 100644 (file)
@@ -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]