From: Fred Morcos Date: Tue, 29 Aug 2023 11:46:38 +0000 (+0200) Subject: Meson: Build modules with all dependencies X-Git-Tag: rec-5.1.0-alpha1~80^2~130 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a611c863f82ebc5c7813cecaf61da775303c656f;p=thirdparty%2Fpdns.git Meson: Build modules with all dependencies --- diff --git a/meson.build b/meson.build index 6f8181793b..7ba99c220a 100644 --- a/meson.build +++ b/meson.build @@ -94,6 +94,35 @@ subdir('meson' / 'various-headers') # Various Headers ext_modules = ['arc4random', 'yahttp', 'ipcrypt', 'json11'] subdir('ext') +deps = [ + dep_pdns, + dep_platform, + dep_atomics, + dep_threads, + dep_lua, + dep_lua_records, + dep_netlibs, + dep_libsodium, + dep_libdecaf, + dep_libcrypto, + dep_libssl, + dep_gnutls, + dep_rt, + dep_boost, + dep_boost_program_options, + dep_unittests, + dep_backend_unittests, + dep_dlopen, + dep_pkcs11, + dep_gss_tsig, + dep_ixfrdist, + dep_yahttp, + dep_ipcrypt, + dep_json11, + dep_arc4random, + dep_systemd, +] + # Modules all_modules = { 'bind': {'deps': [], 'exts': []}, @@ -166,33 +195,6 @@ conf.set_quoted( # Generate config.h config_h = configure_file(configuration: conf, output: 'config.h') -deps = [ - dep_pdns, - dep_platform, - dep_atomics, - dep_threads, - dep_lua, - dep_lua_records, - dep_netlibs, - dep_libsodium, - dep_libdecaf, - dep_libcrypto, - dep_libssl, - dep_gnutls, - dep_rt, - dep_boost, - dep_boost_program_options, - dep_unittests, - dep_backend_unittests, - dep_dlopen, - dep_pkcs11, - dep_gss_tsig, - dep_ixfrdist, - dep_yahttp, - dep_ipcrypt, - dep_json11, - dep_systemd, -] subdir('pdns') pdns_auth = executable( diff --git a/modules/bindbackend/meson.build b/modules/bindbackend/meson.build index 5c582067fb..fcce91b2cd 100644 --- a/modules/bindbackend/meson.build +++ b/modules/bindbackend/meson.build @@ -11,12 +11,12 @@ extras = [ product_source_dir / 'pdns' / 'bind-dnssec.schema.sqlite3.sql', ] -deps = [dep_pdns, dep_libcrypto, dep_boost] +module_deps = [deps] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/geoipbackend/meson.build b/modules/geoipbackend/meson.build index 58a569f4f2..f480e9e15f 100644 --- a/modules/geoipbackend/meson.build +++ b/modules/geoipbackend/meson.build @@ -10,12 +10,12 @@ extras = [ 'geoipinterface.hh', ] -deps = [dep_pdns, dep_geoip] +module_deps = [deps, dep_geoip] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/gmysqlbackend/meson.build b/modules/gmysqlbackend/meson.build index a8a51ed04c..0d5d8044a4 100644 --- a/modules/gmysqlbackend/meson.build +++ b/modules/gmysqlbackend/meson.build @@ -17,12 +17,12 @@ extras = [ 'schema.mysql.sql', ] -deps = [dep_pdns, dep_libcrypto, dep_libssl, dep_mysql] +module_deps = [deps, dep_mysql] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/godbcbackend/meson.build b/modules/godbcbackend/meson.build index f9e526f254..9ce8a76d91 100644 --- a/modules/godbcbackend/meson.build +++ b/modules/godbcbackend/meson.build @@ -13,12 +13,12 @@ extras = [ '4.3.0_to_4.7.0_schema.mssql.sql', ] -deps = [dep_pdns, dep_libcrypto, dep_odbc] +module_deps = [deps, dep_odbc] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/gpgsqlbackend/meson.build b/modules/gpgsqlbackend/meson.build index 65a22a49c6..80207a064f 100644 --- a/modules/gpgsqlbackend/meson.build +++ b/modules/gpgsqlbackend/meson.build @@ -16,12 +16,12 @@ extras = [ '4.3.0_to_4.7.0_schema.pgsql.sql', ] -deps = [dep_pdns, dep_libcrypto, dep_pgsql] +module_deps = [deps, dep_pgsql] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/gsqlite3backend/meson.build b/modules/gsqlite3backend/meson.build index 6e879015f0..14924e2d8b 100644 --- a/modules/gsqlite3backend/meson.build +++ b/modules/gsqlite3backend/meson.build @@ -15,11 +15,11 @@ extras = [ 'schema.sqlite3.sql', ] -deps = [dep_pdns, dep_libcrypto, dep_sqlite3] +module_deps = [deps, dep_sqlite3] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/ldapbackend/meson.build b/modules/ldapbackend/meson.build index fa22dfe800..e62c46b6cd 100644 --- a/modules/ldapbackend/meson.build +++ b/modules/ldapbackend/meson.build @@ -20,12 +20,12 @@ extras = [ 'pdns-domaininfo.schema', ] -deps = [dep_pdns, dep_libcrypto, dep_ldap] +module_deps = [deps, dep_ldap] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/lmdbbackend/meson.build b/modules/lmdbbackend/meson.build index b03a0552ec..424b62a396 100644 --- a/modules/lmdbbackend/meson.build +++ b/modules/lmdbbackend/meson.build @@ -6,12 +6,12 @@ extras = [ 'lmdbbackend.hh', ] -deps = [dep_pdns, dep_lmdb_safe, dep_lmdb, dep_boost_serialization] +module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/lua2backend/meson.build b/modules/lua2backend/meson.build index 304ec25789..f2c29b3875 100644 --- a/modules/lua2backend/meson.build +++ b/modules/lua2backend/meson.build @@ -8,12 +8,12 @@ extras = [ 'lua2api2.hh', ] -deps = [dep_pdns, dep_libcrypto, dep_lua] +module_deps = [deps] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/pipebackend/meson.build b/modules/pipebackend/meson.build index 1cb6cd051b..332ff8e43e 100644 --- a/modules/pipebackend/meson.build +++ b/modules/pipebackend/meson.build @@ -10,12 +10,12 @@ extras = [ 'backend.pl', ] -deps = [dep_pdns, dep_libcrypto, dep_boost] +module_deps = [deps] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/remotebackend/meson.build b/modules/remotebackend/meson.build index 5ee4c5ae69..aa9a74cbb0 100644 --- a/modules/remotebackend/meson.build +++ b/modules/remotebackend/meson.build @@ -25,21 +25,12 @@ extras = [ 'remotebackend.hh', ] -deps = [ - dep_pdns, - dep_yahttp, - dep_json11, - dep_zeromq, - dep_lua, - dep_libsodium, - dep_threads, - dep_arc4random, -] +module_deps = [deps, dep_zeromq] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, ) diff --git a/modules/tinydnsbackend/meson.build b/modules/tinydnsbackend/meson.build index cd356bef55..d28935a1bd 100644 --- a/modules/tinydnsbackend/meson.build +++ b/modules/tinydnsbackend/meson.build @@ -9,12 +9,12 @@ extras = [ product_source_dir / 'pdns' / 'cdb.hh', ] -deps = [dep_pdns, dep_cdb] +module_deps = [deps, dep_cdb] lib = static_library( module_backend_name, sources, - dependencies: deps, + dependencies: module_deps, extra_files: extras, )