From: Fred Morcos Date: Wed, 17 Jan 2024 13:47:34 +0000 (+0100) Subject: Meson: Don't import the fs module at the toplevel X-Git-Tag: rec-5.1.0-alpha1~80^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1dc8cc71f4ca2d1c92ee4e7ce1f2cc48dd8a230;p=thirdparty%2Fpdns.git Meson: Don't import the fs module at the toplevel --- diff --git a/meson.build b/meson.build index 5196e029ec..32ff788de3 100644 --- a/meson.build +++ b/meson.build @@ -17,9 +17,6 @@ product_build_dir = meson.current_build_dir() summary('Source Dir', product_source_dir, section: 'Build') summary('Build Dir', product_build_dir, section: 'Build') -# Setup some modules -fs = import('fs') - # Create the configuration object and dependencies list. conf = configuration_data() @@ -105,6 +102,8 @@ if get_option('module-lmdb') != 'disabled' subdir('ext' / 'lmdb-safe') endif + + deps = [ dep_pdns, dep_platform, diff --git a/meson/timet-sign/meson.build b/meson/timet-sign/meson.build index 66349cd9a1..d6670485a3 100644 --- a/meson/timet-sign/meson.build +++ b/meson/timet-sign/meson.build @@ -1,3 +1,5 @@ +fs = import('fs') + prog = fs.read('timet_sign.cc') timet_signed = cxx.compiles(prog, name: 'time_t is signed')