]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#3729] Moved boost and threads to project deps
authorFrancis Dupont <fdupont@isc.org>
Mon, 10 Feb 2025 22:04:49 +0000 (23:04 +0100)
committerAndrei Pavel <andrei@isc.org>
Thu, 13 Feb 2025 08:06:31 +0000 (10:06 +0200)
33 files changed:
meson.build
src/bin/lfc/meson.build
src/bin/perfdhcp/meson.build
src/hooks/dhcp/bootp/meson.build
src/hooks/dhcp/user_chk/meson.build
src/lib/asiodns/meson.build
src/lib/asiolink/meson.build
src/lib/cc/meson.build
src/lib/config/meson.build
src/lib/d2srv/tests/meson.build
src/lib/d2srv/testutils/meson.build
src/lib/database/meson.build
src/lib/dhcp/meson.build
src/lib/dhcp/testutils/meson.build
src/lib/dhcp_ddns/meson.build
src/lib/dhcpsrv/meson.build
src/lib/dhcpsrv/tests/meson.build
src/lib/dhcpsrv/testutils/meson.build
src/lib/dns/meson.build
src/lib/eval/meson.build
src/lib/hooks/meson.build
src/lib/hooks/tests/meson.build
src/lib/http/meson.build
src/lib/log/meson.build
src/lib/log/tests/meson.build
src/lib/mysql/meson.build
src/lib/mysql/testutils/meson.build
src/lib/pgsql/meson.build
src/lib/process/meson.build
src/lib/process/testutils/meson.build
src/lib/stats/meson.build
src/lib/tcp/meson.build
src/lib/util/meson.build

index 420dd9984d639890cfac400b9275bc96d28058ac..da4e9bf37b2a584d34e9768e0eb83e8c25bb830c 100644 (file)
@@ -131,9 +131,11 @@ bison_exe = find_program('bison', required: false)
 #### Dependencies
 
 boost = dependency('boost', version: '>=1.66')
+threads = dependency('threads')
+add_project_dependencies(boost, threads, language: ['cpp'])
 gtest = dependency('gtest', required: false)
 log4cplus = dependency('log4cplus')
-threads = dependency('threads')
+
 
 # Cryptography
 crypto = disabler()
index 4c3b2e9f9e98e718b33191e1c45b63e2bdee781e..f66e251580645298f8adea0c1164740129968ba4 100644 (file)
@@ -3,13 +3,11 @@ lfc_lib = static_library(
     'lfc_controller.cc',
     'lfc_log.cc',
     'lfc_messages.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
 )
 executable(
     'kea-lfc',
     'main.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
index 413bf1db8568a5f82b8798582b42a606d5e4676d..6a52e2e86b72ac78748a1c09714d46d996d113ab 100644 (file)
@@ -11,13 +11,11 @@ perfdhcp_lib = static_library(
     'receiver.cc',
     'stats_mgr.cc',
     'test_control.cc',
-    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
 )
 executable(
     'perfdhcp',
     'main.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'sbin',
index 19e192cb98e3feecf495c002bd49a5b0b8da65e0..ea7519550f9557a0e94551177520a589eae0b1e8 100644 (file)
@@ -4,7 +4,6 @@ dhcp_bootp_lib = shared_library(
     'bootp_log.cc',
     'bootp_messages.cc',
     'version.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib/kea/hooks',
index 6107f91e134b3445e2866dc0e6ad95a0aca008ea..981b772b7a64672bb7170b64b8f037b796c9157d 100644 (file)
@@ -11,7 +11,6 @@ dhcp_user_chk_lib = shared_library(
     'user_file.cc',
     'user_registry.cc',
     'version.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: false,
     install_dir: 'lib/kea/hooks',
index a55a14347d3fde028492278672b48ed038a4f47d..8a2bf5029fc6765931777387a27d59831960e092 100644 (file)
@@ -3,7 +3,6 @@ kea_asiodns_lib = library(
     'asiodns_messages.cc',
     'io_fetch.cc',
     'logger.cc',
-    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 57a65fe18bbfe663b97770a69dde24764fca1754..efe146fd0d0b6458e082db2e4eb59fbec6ef8a29 100644 (file)
@@ -14,7 +14,7 @@ kea_asiolink_lib = library(
     'openssl_tls.cc',
     'process_spawn.cc',
     'unix_domain_socket.cc',
-    dependencies: [boost, crypto, threads],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index ef32b66e7d50fe7f44fd02c6a9f4438d97810da8..51a7ee911bd262e0ebea155db3a829dc3828c773 100644 (file)
@@ -15,7 +15,6 @@ kea_cc_lib = library(
     'stamped_value.cc',
     'user_context.cc',
     cpp_args: kea_cc_lib_cpp_args,
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index ad8031eec0e2889bdc3d638d7fa6b11a3cf5d8d6..ec99f408a82591c093d620cb0c42c1fdc105b394 100644 (file)
@@ -13,7 +13,7 @@ kea_config_lib = library(
     'http_command_response_creator.cc',
     'unix_command_config.cc',
     'unix_command_mgr.cc',
-    dependencies: [crypto, threads],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index ae6d8e32ae7f69471d8a9b327476c82b9f3fb1ae..8455e7902d34bbc1d9365cdf41a45c38c673e4e2 100644 (file)
@@ -11,7 +11,7 @@ kea_d2srv_tests = executable(
     'd2_zone_unittests.cc',
     'dns_client_unittests.cc',
     'nc_trans_unittests.cc',
-    dependencies: [boost, crypto, gtest],
+    dependencies: [crypto, gtest],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
 )
index e7b1ba124f0f39aee5fc69a2ede76f7b05d8a359..6cfd0720b87eebe2afcbb177436bd367cda56f1d 100644 (file)
@@ -6,6 +6,6 @@ kea_d2srv_testutils_lib = static_library(
     'kea-d2srv-testutils',
     'nc_test_utils.cc',
     'stats_test_utils.cc',
-    dependencies: [boost, crypto, gtest],
+    dependencies: [crypto, gtest],
     include_directories: [include_directories('.')] + INCLUDES,
 )
index 374ad068c36e681311de3217d3d4b1856dc39ffb..5e3b2b95ca601a8a512be378cfea0609878dda1e 100644 (file)
@@ -9,7 +9,6 @@ kea_database_lib = library(
     'server.cc',
     'server_collection.cc',
     'server_selector.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 052e3f38eabf2d80e7c56833ba6d348259edc719..66e862554d45a38994e041015b78c620e7281828 100644 (file)
@@ -54,7 +54,6 @@ kea_dhcp_lib = library(
     'pkt_filter_inet6.cc',
     pkt_filter_cc,
     'protocol_util.cc',
-    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 2982a83ce93c65588284d01e60cae28cc8a79459..ad77e49fa558bd6b4a45d45503bca22d353955b2 100644 (file)
@@ -9,6 +9,6 @@ kea_dhcp_testutils_lib = static_library(
     'pkt_captures6.cc',
     'pkt_filter6_test_stub.cc',
     'pkt_filter_test_stub.cc',
-    dependencies: [boost, gtest],
+    dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
 )
index c980b28eeee6dbe6e983643fc2a0d99d33aea0d4..922b65d9a2ae50c629a740288ce95d987eafc711 100644 (file)
@@ -5,7 +5,6 @@ kea_dhcp_ddns_lib = library(
     'ncr_io.cc',
     'ncr_msg.cc',
     'ncr_udp.cc',
-    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 647ad7ee7c749eb78f4f0b68c30eb8e534b41dcf..1f8562b4696d124a2796c985295e9fb55e1fb26c 100644 (file)
@@ -89,7 +89,7 @@ kea_dhcpsrv_lib = library(
         f'-DDHCP_DATA_DIR="@DHCP_DATA_DIR@"',
         f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
     ],
-    dependencies: [boost, crypto, threads],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index f122e5602d5e77a18554b479b3b9c6438a7bb00e..082ed1f5207f8fe7fd6e9b5635abc58743f7c72f 100644 (file)
@@ -101,7 +101,7 @@ kea_dhcpsrv_tests = executable(
         f'-DKEA_LFC_BUILD_DIR="@TOP_BUILD_DIR@/src/bin/lfc"',
         f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"',
     ],
-    dependencies: [boost, crypto, gtest],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + libs_testutils + LIBS_BUILT_SO_FAR,
 )
@@ -115,7 +115,6 @@ test(
 shared_library(
     'co1',
     'callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -124,7 +123,6 @@ shared_library(
 shared_library(
     'co2',
     'callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -133,7 +131,6 @@ shared_library(
 shared_library(
     'co3',
     'callout_params_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
index b885cc7a97d83f63210d33b343f0fecea8c4a455..00aac1dbbb8b6ca99b6077667ca6163e4cf26f28 100644 (file)
@@ -20,7 +20,7 @@ sources = [
     'test_config_backend_dhcp6.cc',
     'test_utils.cc',
 ]
-dependencies = [boost, crypto, gtest]
+dependencies = [crypto, gtest]
 if mysql.found()
     sources += ['mysql_generic_backend_unittest.cc']
     dependencies += [mysql]
index 94403310e9354a89ae1a079e15d4c50602be08c7..2e53f93969bfdfd34be968da52c61ebaef1e35e6 100644 (file)
@@ -26,7 +26,6 @@ kea_dns_lib = library(
     'tsigerror.cc',
     'tsigkey.cc',
     'tsigrecord.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index a69b4912a16a896c4f39b4e5bc5959a5683e755e..7f6200073b68e38c4c57a0184342bfc3bf85386f 100644 (file)
@@ -8,7 +8,6 @@ kea_eval_lib = library(
     'lexer.cc',
     'parser.cc',
     'token.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 60193652847b078e22a323421f4f87fc2e84938f..c8808e551f50109a28cabfc44db61cea82dd71ef 100644 (file)
@@ -14,7 +14,6 @@ kea_hooks_lib = library(
     'library_manager_collection.cc',
     'server_hooks.cc',
     cpp_args: [f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"'],
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 03e297ea7e0032930151dd455efeafe423a86364..f05c2575b2ec3c934cd01e0a41cf35385d3a7596 100644 (file)
@@ -37,7 +37,6 @@ configure_file(
 shared_library(
     'nvl',
     'no_version_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -46,7 +45,6 @@ shared_library(
 shared_library(
     'ivl',
     'incorrect_version_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -55,7 +53,6 @@ shared_library(
 shared_library(
     'fxl',
     'framework_exception_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -64,7 +61,6 @@ shared_library(
 shared_library(
     'bcl',
     'basic_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -73,7 +69,6 @@ shared_library(
 shared_library(
     'lcl',
     'load_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -82,7 +77,6 @@ shared_library(
 shared_library(
     'lecl',
     'load_error_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -91,7 +85,6 @@ shared_library(
 shared_library(
     'ucl',
     'unload_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -100,7 +93,6 @@ shared_library(
 shared_library(
     'fcl',
     'full_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -109,7 +101,6 @@ shared_library(
 shared_library(
     'pcl',
     'callout_params_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
@@ -118,7 +109,6 @@ shared_library(
 shared_library(
     'acl',
     'async_callout_library.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
     build_rpath: '/nowhere',
index 98919feda2147ba292044bf2a2fa458aa2e888a8..601ac37362a54c0d17990342be3a0b21879065dd 100644 (file)
@@ -25,7 +25,7 @@ kea_http_lib = library(
     'response_json.cc',
     'response_parser.cc',
     'url.cc',
-    dependencies: [crypto, threads],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index c8116a5b69ced86a4ebf95a5d287a9bec883685c..cb667fd8d2f9c07edf2827f11228ad5670f9fcff 100644 (file)
@@ -20,7 +20,7 @@ kea_log_lib = library(
     'message_reader.cc',
     'output_option.cc',
     cpp_args: [f'-DTOP_BUILDDIR="@TOP_BUILD_DIR@"'],
-    dependencies: [boost, log4cplus],
+    dependencies: [log4cplus],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 1c668310305a8f2cffcf7331e73be08755081dc1..83e6962c5f54e9253ade712ac4ac0517f1c465a5 100644 (file)
@@ -30,7 +30,7 @@ kea_log_init_tests = executable(
     'run_initializer_unittests.cc',
     'message_initializer_1_unittest.cc',
     'message_initializer_1a_unittest.cc',
-    dependencies: [boost, gtest, log4cplus],
+    dependencies: [gtest, log4cplus],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
@@ -39,21 +39,18 @@ test('kea_log_init_tests', kea_log_init_tests, protocol: 'gtest')
 logger_example = executable(
     'logger_example',
     'logger_example.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 init_logger_test = executable(
     'init_logger_test',
     'init_logger_test.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
 buffer_logger_test = executable(
     'buffer_logger_test',
     'buffer_logger_test.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
@@ -61,7 +58,6 @@ logger_lock_test = executable(
     'logger_lock_test',
     'logger_lock_test.cc',
     'log_test_messages.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib] + LIBS_BUILT_SO_FAR,
 )
index 2d8e85b072f617d4c0d921dc81fd82921e13dc4b..9599385b604bf4fec12854d6d591c6e90580a1eb 100644 (file)
@@ -7,7 +7,7 @@ kea_mysql_lib = library(
     'mysql_binding.cc',
     'mysql_connection.cc',
     cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
-    dependencies: [boost, mysql],
+    dependencies: [mysql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 69bfc8572db73e9ac61cd08a530468353f409bd0..658c73c0b30733b5c3ef1bf014b92bcc35141d20 100644 (file)
@@ -9,6 +9,6 @@ kea_mysql_testutils_lib = static_library(
         f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"',
         f'-DDATABASE_WIPE_DIR="@DATABASE_SCRIPTS_DIR@"',
     ],
-    dependencies: [boost, gtest, mysql],
+    dependencies: [gtest, mysql],
     include_directories: [include_directories('.')] + INCLUDES,
 )
index 7446bfa61a62078b89bc62fb50bb9258b1d43f8f..2698d6bba79f08d6302654c05856a2cab22ebb1c 100644 (file)
@@ -7,7 +7,7 @@ kea_pgsql_lib = library(
     'pgsql_connection.cc',
     'pgsql_exchange.cc',
     cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
-    dependencies: [boost, postgresql],
+    dependencies: [postgresql],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 6af59e2e36364ba538b6c726edf34831ad65cc70..82bc68adbb130ccff985b23dadebad5cfac46e71 100644 (file)
@@ -13,7 +13,7 @@ kea_process_lib = library(
     'process_messages.cc',
     'redact_config.cc',
     cpp_args: [f'-DDATA_DIR="@DHCP_DATA_DIR@"'],
-    dependencies: [boost, gtest],
+    dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 99d0a10ca0115f27b1f12b4e1a493674103e9a99..cad4700a26724ac54bbe42501679c56544854955 100644 (file)
@@ -6,6 +6,6 @@ kea_process_testutils_lib = static_library(
     'kea-process-testutils',
     'd_test_stubs.cc',
     cpp_args: [f'-DDATABASE_SCRIPTS_DIR="@DATABASE_SCRIPTS_DIR@"'],
-    dependencies: [boost, gtest],
+    dependencies: [gtest],
     include_directories: [include_directories('.')] + INCLUDES,
 )
index 695d9871bcce152fb509d1f556f515c431b1a7a8..7d366cdf41953b008b789b64ee140f6415817849 100644 (file)
@@ -3,7 +3,6 @@ kea_stats_lib = library(
     'context.cc',
     'observation.cc',
     'stats_mgr.cc',
-    dependencies: [boost],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 470c001b3fd60a12dc2d630bf0e5173fef76fc28..d4c10b3410da112eeac1d199f76757cb74aea4d6 100644 (file)
@@ -7,7 +7,7 @@ kea_tcp_lib = library(
     'tcp_log.cc',
     'tcp_messages.cc',
     'tcp_stream_msg.cc',
-    dependencies: [crypto, threads],
+    dependencies: [crypto],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',
index 1e34d346768b5da40e6288e7662419dfc76b555b..d9a6532394e433174057491700f299ce1aaffc5c 100644 (file)
@@ -19,7 +19,6 @@ kea_util_lib = library(
     'versioned_csv_file.cc',
     'watched_thread.cc',
     'watch_socket.cc',
-    dependencies: [boost, threads],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: 'lib',