From: Andrei Pavel Date: Wed, 19 Mar 2025 13:46:31 +0000 (+0200) Subject: [#3731] Fix rpath X-Git-Tag: Kea-2.7.7~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c77db8d503ed27831885584f15fcb30414a6c17;p=thirdparty%2Fkea.git [#3731] Fix rpath --- diff --git a/meson.build b/meson.build index 45fbf0db5c..40552b2cd0 100644 --- a/meson.build +++ b/meson.build @@ -48,7 +48,8 @@ SBINDIR = get_option('sbindir') SYSCONFDIR = get_option('sysconfdir') DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts' -DEFAULT_HOOKS_PATH = PREFIX / LIBDIR / 'kea/hooks' +HOOKS_PATH = LIBDIR / 'kea/hooks' +DEFAULT_HOOKS_PATH = PREFIX / HOOKS_PATH KEA_ADMIN_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-admin' KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin' KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc' @@ -472,22 +473,18 @@ conf_data.set('PACKAGE_VERSION_TYPE', f'"@package_version_type@"') #### System-specific Compiler Flags -compile_args = [] -link_args = [] +compile_args = get_option('cpp_args') +link_args = get_option('cpp_link_args') # $ORIGIN documented at https://www.man7.org/linux/man-pages/man8/ld.so.8.html -rpath1 = '$ORIGIN/../lib' # rpath for executables -rpath2 = '$ORIGIN/../..' # rpath for hook libraries +# EXECUTABLE_RPATH = f'$ORIGIN/../@LIBDIR@' +# HOOK_RPATH = '$ORIGIN/../..' +INSTALL_RPATH = PREFIX / LIBDIR +BUILD_RPATH = TOP_BUILD_DIR / 'src/lib' + if SYSTEM == 'darwin' - compile_args += ['-D__APPLE_USE_RFC_3542'] + compile_args += '-D__APPLE_USE_RFC_3542' add_project_arguments('-D__APPLE_USE_RFC_3542', language: 'cpp') - link_arg = f'-Wl,-rpath,@rpath1@,-rpath,@rpath2@' - link_args += [link_arg] - add_project_link_arguments(link_arg, language: 'cpp') -else - link_arg = f'-Wl,-rpath=@rpath1@,-rpath=@rpath2@' - link_args += [link_arg] - add_project_link_arguments(link_arg, language: 'cpp') endif premium = fs.is_dir('premium') diff --git a/src/bin/agent/meson.build b/src/bin/agent/meson.build index 3385ae7f27..c6afbfacc2 100644 --- a/src/bin/agent/meson.build +++ b/src/bin/agent/meson.build @@ -21,6 +21,8 @@ executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [agent_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/bin/d2/meson.build b/src/bin/d2/meson.build index 70166296da..012b40d751 100644 --- a/src/bin/d2/meson.build +++ b/src/bin/d2/meson.build @@ -25,6 +25,8 @@ executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [d2_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/bin/dhcp4/meson.build b/src/bin/dhcp4/meson.build index 7ea035d934..3dac320fbe 100644 --- a/src/bin/dhcp4/meson.build +++ b/src/bin/dhcp4/meson.build @@ -20,6 +20,8 @@ kea_dhcp4 = executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [dhcp4_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/bin/dhcp6/meson.build b/src/bin/dhcp6/meson.build index 5c9a707e00..de60fbf0b2 100644 --- a/src/bin/dhcp6/meson.build +++ b/src/bin/dhcp6/meson.build @@ -21,6 +21,8 @@ kea_dhcp6 = executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [dhcp6_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/bin/lfc/meson.build b/src/bin/lfc/meson.build index e66e6210f8..181ff311cb 100644 --- a/src/bin/lfc/meson.build +++ b/src/bin/lfc/meson.build @@ -11,6 +11,8 @@ kea_lfc = executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [lfc_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/bin/netconf/meson.build b/src/bin/netconf/meson.build index 8de19b0302..c822aa378c 100644 --- a/src/bin/netconf/meson.build +++ b/src/bin/netconf/meson.build @@ -32,6 +32,8 @@ executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [netconf_lib] + LIBS_BUILT_SO_FAR, override_options: ['cpp_std=c++20'], ) diff --git a/src/bin/perfdhcp/meson.build b/src/bin/perfdhcp/meson.build index 635a5fa008..879087ea11 100644 --- a/src/bin/perfdhcp/meson.build +++ b/src/bin/perfdhcp/meson.build @@ -19,6 +19,8 @@ executable( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: SBINDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: [perfdhcp_lib] + LIBS_BUILT_SO_FAR, ) subdir('tests') diff --git a/src/hooks/d2/gss_tsig/meson.build b/src/hooks/d2/gss_tsig/meson.build index 84021c9779..c209246a67 100644 --- a/src/hooks/d2/gss_tsig/meson.build +++ b/src/hooks/d2/gss_tsig/meson.build @@ -18,7 +18,9 @@ ddns_gss_tsig_lib = shared_library( dependencies: [KRB5_DEP, CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build index 2bf8abe7ed..07e34e63bd 100644 --- a/src/hooks/dhcp/bootp/meson.build +++ b/src/hooks/dhcp/bootp/meson.build @@ -6,7 +6,9 @@ dhcp_bootp_lib = shared_library( 'version.cc', include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/class_cmds/meson.build b/src/hooks/dhcp/class_cmds/meson.build index f0b42ca19a..043be87cd5 100644 --- a/src/hooks/dhcp/class_cmds/meson.build +++ b/src/hooks/dhcp/class_cmds/meson.build @@ -8,7 +8,9 @@ dhcp_class_cmds_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/ddns_tuning/meson.build b/src/hooks/dhcp/ddns_tuning/meson.build index 4073c4b9c5..d64ad9cace 100644 --- a/src/hooks/dhcp/ddns_tuning/meson.build +++ b/src/hooks/dhcp/ddns_tuning/meson.build @@ -9,7 +9,9 @@ dhcp_ddns_tuning_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/flex_id/meson.build b/src/hooks/dhcp/flex_id/meson.build index 02863f3dbf..7cd86a0959 100644 --- a/src/hooks/dhcp/flex_id/meson.build +++ b/src/hooks/dhcp/flex_id/meson.build @@ -8,7 +8,9 @@ dhcp_flex_id_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build index e35181142e..feceac1de4 100644 --- a/src/hooks/dhcp/flex_option/meson.build +++ b/src/hooks/dhcp/flex_option/meson.build @@ -8,7 +8,9 @@ dhcp_flex_option_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build index f5f13eaef3..90d50460b9 100644 --- a/src/hooks/dhcp/forensic_log/meson.build +++ b/src/hooks/dhcp/forensic_log/meson.build @@ -12,7 +12,9 @@ dhcp_forensic_log_lib = shared_library( dependencies: [CRYPTO_DEP, MYSQL_DEP, POSTGRESQL_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build index 298d38d62f..78374b58ae 100644 --- a/src/hooks/dhcp/high_availability/meson.build +++ b/src/hooks/dhcp/high_availability/meson.build @@ -17,7 +17,9 @@ dhcp_ha_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/host_cache/meson.build b/src/hooks/dhcp/host_cache/meson.build index 6fbb84ba58..02654659a6 100644 --- a/src/hooks/dhcp/host_cache/meson.build +++ b/src/hooks/dhcp/host_cache/meson.build @@ -11,7 +11,9 @@ dhcp_host_cache_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/host_cmds/meson.build b/src/hooks/dhcp/host_cmds/meson.build index bf14e5a44e..ce59c6b6de 100644 --- a/src/hooks/dhcp/host_cmds/meson.build +++ b/src/hooks/dhcp/host_cmds/meson.build @@ -8,7 +8,9 @@ dhcp_host_cmds_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build index e5c96ba763..86a4f1f659 100644 --- a/src/hooks/dhcp/lease_cmds/meson.build +++ b/src/hooks/dhcp/lease_cmds/meson.build @@ -10,7 +10,9 @@ dhcp_lease_cmds_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/lease_query/meson.build b/src/hooks/dhcp/lease_query/meson.build index bd8ff5d2a1..22cc116ea1 100644 --- a/src/hooks/dhcp/lease_query/meson.build +++ b/src/hooks/dhcp/lease_query/meson.build @@ -16,7 +16,9 @@ dhcp_lease_query_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/limits/meson.build b/src/hooks/dhcp/limits/meson.build index 58390145c6..939746ce19 100644 --- a/src/hooks/dhcp/limits/meson.build +++ b/src/hooks/dhcp/limits/meson.build @@ -11,7 +11,9 @@ dhcp_limits_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.'), include_directories('..')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build index df18728f3e..fe74c7fc9a 100644 --- a/src/hooks/dhcp/mysql/meson.build +++ b/src/hooks/dhcp/mysql/meson.build @@ -23,7 +23,9 @@ dhcp_mysql_lib = shared_library( dependencies: [CRYPTO_DEP, MYSQL_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build index ac1c0d7d9d..b2b6b37aa6 100644 --- a/src/hooks/dhcp/perfmon/meson.build +++ b/src/hooks/dhcp/perfmon/meson.build @@ -13,7 +13,9 @@ dhcp_perfmon_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build index 7ab4d20d6a..2932f8250c 100644 --- a/src/hooks/dhcp/pgsql/meson.build +++ b/src/hooks/dhcp/pgsql/meson.build @@ -23,7 +23,9 @@ dhcp_pgsql_lib = shared_library( dependencies: [CRYPTO_DEP, POSTGRESQL_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/ping_check/meson.build b/src/hooks/dhcp/ping_check/meson.build index c395fcab96..d3a1e70b49 100644 --- a/src/hooks/dhcp/ping_check/meson.build +++ b/src/hooks/dhcp/ping_check/meson.build @@ -14,7 +14,9 @@ dhcp_ping_check_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build index 2d99d0303d..f2f2ba3722 100644 --- a/src/hooks/dhcp/radius/meson.build +++ b/src/hooks/dhcp/radius/meson.build @@ -29,7 +29,9 @@ dhcp_radius_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build index cde2456102..d29ee01bc3 100644 --- a/src/hooks/dhcp/run_script/meson.build +++ b/src/hooks/dhcp/run_script/meson.build @@ -8,7 +8,9 @@ dhcp_run_script_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build index b9c37b1da3..40b58a2ad6 100644 --- a/src/hooks/dhcp/stat_cmds/meson.build +++ b/src/hooks/dhcp/stat_cmds/meson.build @@ -8,7 +8,9 @@ dhcp_stat_cmds_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/subnet_cmds/meson.build b/src/hooks/dhcp/subnet_cmds/meson.build index e579f230fd..e7920c00af 100644 --- a/src/hooks/dhcp/subnet_cmds/meson.build +++ b/src/hooks/dhcp/subnet_cmds/meson.build @@ -8,7 +8,9 @@ dhcp_subnet_cmds_lib = shared_library( dependencies: [CRYPTO_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build index 57bb5258e0..7cbe948d09 100644 --- a/src/hooks/dhcp/user_chk/meson.build +++ b/src/hooks/dhcp/user_chk/meson.build @@ -13,7 +13,9 @@ dhcp_user_chk_lib = shared_library( 'version.cc', include_directories: [include_directories('.')] + INCLUDES, install: false, - install_dir: LIBDIR / 'kea/hooks', + install_dir: HOOKS_PATH, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, name_suffix: 'so', ) diff --git a/src/lib/asiodns/meson.build b/src/lib/asiodns/meson.build index a1841f140c..42db1d32a0 100644 --- a/src/lib/asiodns/meson.build +++ b/src/lib/asiodns/meson.build @@ -6,6 +6,8 @@ kea_asiodns_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '60.0.0', ) diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build index f44cbcc001..86307610df 100644 --- a/src/lib/asiolink/meson.build +++ b/src/lib/asiolink/meson.build @@ -18,6 +18,8 @@ kea_asiolink_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '83.0.0', # Avoids: ld: error: undefined symbol: environ on FreeBSD diff --git a/src/lib/cc/meson.build b/src/lib/cc/meson.build index ba7016c8e2..80fb8946c0 100644 --- a/src/lib/cc/meson.build +++ b/src/lib/cc/meson.build @@ -18,6 +18,8 @@ kea_cc_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '80.0.0', ) diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build index 9b354eb338..77bb9d62d7 100644 --- a/src/lib/config/meson.build +++ b/src/lib/config/meson.build @@ -17,6 +17,8 @@ kea_config_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '80.0.0', ) diff --git a/src/lib/cryptolink/meson.build b/src/lib/cryptolink/meson.build index f8ec8a8e31..b478cb074e 100644 --- a/src/lib/cryptolink/meson.build +++ b/src/lib/cryptolink/meson.build @@ -16,6 +16,8 @@ kea_cryptolink_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '61.0.0', ) diff --git a/src/lib/d2srv/meson.build b/src/lib/d2srv/meson.build index f7e414a0fc..8f9c7be8eb 100644 --- a/src/lib/d2srv/meson.build +++ b/src/lib/d2srv/meson.build @@ -15,6 +15,8 @@ kea_d2srv_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '61.0.0', ) diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build index 24aff28b44..566dd75d1c 100644 --- a/src/lib/database/meson.build +++ b/src/lib/database/meson.build @@ -12,6 +12,8 @@ kea_database_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '74.0.0', ) diff --git a/src/lib/dhcp/meson.build b/src/lib/dhcp/meson.build index e949b77b9c..cc53365bd4 100644 --- a/src/lib/dhcp/meson.build +++ b/src/lib/dhcp/meson.build @@ -57,6 +57,8 @@ kea_dhcp_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '106.0.0', ) diff --git a/src/lib/dhcp_ddns/meson.build b/src/lib/dhcp_ddns/meson.build index 64be8cc7e0..c0d0aad575 100644 --- a/src/lib/dhcp_ddns/meson.build +++ b/src/lib/dhcp_ddns/meson.build @@ -8,6 +8,8 @@ kea_dhcp_ddns_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '66.0.0', ) diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build index d26ee0b70f..324e538693 100644 --- a/src/lib/dhcpsrv/meson.build +++ b/src/lib/dhcpsrv/meson.build @@ -99,6 +99,8 @@ kea_dhcpsrv_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '125.0.0', ) diff --git a/src/lib/dns/meson.build b/src/lib/dns/meson.build index a9d0038520..2ad92a9c6d 100644 --- a/src/lib/dns/meson.build +++ b/src/lib/dns/meson.build @@ -29,6 +29,8 @@ kea_dns_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '68.0.0', ) diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build index 1473642ef7..8b3034a4cd 100644 --- a/src/lib/eval/meson.build +++ b/src/lib/eval/meson.build @@ -11,6 +11,8 @@ kea_eval_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '81.0.0', ) diff --git a/src/lib/exceptions/meson.build b/src/lib/exceptions/meson.build index f0af9199d9..b6fb88d013 100644 --- a/src/lib/exceptions/meson.build +++ b/src/lib/exceptions/meson.build @@ -4,6 +4,8 @@ kea_exceptions_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '43.0.0', ) diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build index 2fd3940849..3d910739e1 100644 --- a/src/lib/hooks/meson.build +++ b/src/lib/hooks/meson.build @@ -17,6 +17,8 @@ kea_hooks_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '114.0.0', ) diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build index b1d156a7a9..3558cd2198 100644 --- a/src/lib/http/meson.build +++ b/src/lib/http/meson.build @@ -29,6 +29,8 @@ kea_http_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '85.0.0', ) diff --git a/src/lib/log/interprocess/meson.build b/src/lib/log/interprocess/meson.build index c34fb6fe59..ef253b48bb 100644 --- a/src/lib/log/interprocess/meson.build +++ b/src/lib/log/interprocess/meson.build @@ -6,6 +6,8 @@ kea_log_interprocess_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '1.0.0', ) diff --git a/src/lib/log/meson.build b/src/lib/log/meson.build index 359fea7f57..e31f9ca0dd 100644 --- a/src/lib/log/meson.build +++ b/src/lib/log/meson.build @@ -24,6 +24,8 @@ kea_log_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '72.0.0', ) diff --git a/src/lib/mysql/meson.build b/src/lib/mysql/meson.build index e3142ef243..d711ab4566 100644 --- a/src/lib/mysql/meson.build +++ b/src/lib/mysql/meson.build @@ -11,6 +11,8 @@ kea_mysql_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '85.0.0', ) diff --git a/src/lib/pgsql/meson.build b/src/lib/pgsql/meson.build index 31e223dbce..213bd68c90 100644 --- a/src/lib/pgsql/meson.build +++ b/src/lib/pgsql/meson.build @@ -11,6 +11,8 @@ kea_pgsql_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '85.0.0', ) diff --git a/src/lib/process/cfgrpt/meson.build b/src/lib/process/cfgrpt/meson.build index 3cb953dc1e..439091a96e 100644 --- a/src/lib/process/cfgrpt/meson.build +++ b/src/lib/process/cfgrpt/meson.build @@ -11,6 +11,8 @@ kea_cfgrpt_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '1.0.0', ) diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build index 6c0916005e..3850d55d91 100644 --- a/src/lib/process/meson.build +++ b/src/lib/process/meson.build @@ -17,6 +17,8 @@ kea_process_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '86.0.0', ) diff --git a/src/lib/stats/meson.build b/src/lib/stats/meson.build index 6edbdba848..b0cf873519 100644 --- a/src/lib/stats/meson.build +++ b/src/lib/stats/meson.build @@ -6,6 +6,8 @@ kea_stats_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '51.0.0', ) diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build index 90046b9016..42f4a46f33 100644 --- a/src/lib/tcp/meson.build +++ b/src/lib/tcp/meson.build @@ -11,6 +11,8 @@ kea_tcp_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '31.0.0', ) diff --git a/src/lib/util/io/meson.build b/src/lib/util/io/meson.build index c4a80af7ee..ab348ca4d0 100644 --- a/src/lib/util/io/meson.build +++ b/src/lib/util/io/meson.build @@ -4,6 +4,8 @@ kea_util_io_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '10.0.0', ) diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build index 251258bcfb..bb5eb87211 100644 --- a/src/lib/util/meson.build +++ b/src/lib/util/meson.build @@ -22,6 +22,8 @@ kea_util_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '98.0.0', ) diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build index 8795985e18..02ec93a331 100644 --- a/src/lib/yang/meson.build +++ b/src/lib/yang/meson.build @@ -27,6 +27,8 @@ kea_yang_lib = shared_library( include_directories: [include_directories('.')] + INCLUDES, install: true, install_dir: LIBDIR, + install_rpath: INSTALL_RPATH, + build_rpath: BUILD_RPATH, link_with: LIBS_BUILT_SO_FAR, version: '71.0.0', override_options: ['cpp_std=c++20'],