[#3731] Fix rpath

diff --git a/meson.build b/meson.build
index 45fbf0db5c35d6ad1a3cfcd93b8458c864bb4490..40552b2cd0f43f41ccda4d92671d512b3100e88a 100644 (file)
--- 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 3385ae7f278e56e2b042313be109eebc9b148bc0..c6afbfacc2e708c1f4b59356af89136b6da858a2 100644 (file)
--- 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 70166296dacc04b8b27bfd5b25ec29e653863e99..012b40d7510f8d9e74d19ffd83ae3b7046ec09ac 100644 (file)
--- 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 7ea035d93471c61e032f7a5a06b6ae6296b08f3e..3dac320fbea63bcafe2e27deed3ac41772a10ad6 100644 (file)
--- 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 5c9a707e00a539942b861b8c5e61e11d984bf1e1..de60fbf0b244c56678c8442be091730aad8b4995 100644 (file)
--- 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 e66e6210f8e6df23f8356f60c450d2e65cbeae03..181ff311cb7afc9f89953e814596bb933d7fe0db 100644 (file)
--- 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 8de19b0302a77d0d675050197ebc30c4a72b5e90..c822aa378cdbf82c6d624641289688420fec09df 100644 (file)
--- 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 635a5fa008ff4fe27bd0c85f90722880cc47a006..879087ea1184bad4e0a1dfe6dbdb2db0baae20c4 100644 (file)
--- 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 84021c977967fc0e6e4e6d9020b5364cf76be50d..c209246a67e7b69cd61429fc5e1aa587c09002f2 100644 (file)
--- 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 2bf8abe7edcf6d658b3cd1d5c6cdfe81b7225abf..07e34e63bdb3b4dd2d954b8cbf77f0b26dc9d58b 100644 (file)
--- 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 f0b42ca19a388bcf20d625f41246e221cefdf535..043be87cd500c0e7daf96851bcf4f94aecff525e 100644 (file)
--- 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 4073c4b9c596369848d32df6b171b314f4972d0f..d64ad9cace5444307f62b7c55c6bf6666efc6ea8 100644 (file)
--- 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 02863f3dbf4dddaa3e004d2127ccb37212fcc4a8..7cd86a09592919f86f75da89096b0bbb6501cfc9 100644 (file)
--- 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 e35181142eca73ea7705013dee2e032a8be12841..feceac1de4d75e91a5e0b23d9db5cd8c0e0d5f04 100644 (file)
--- 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 f5f13eaef3847aa930661b88c81be5b5bd9cc119..90d50460b9b75a09ee61fe7b5968d7d75e8007c2 100644 (file)
--- 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 298d38d62f2cfad962ec7850742578e59796d1e8..78374b58ae17d260fc3dc1cf5bf523fbc9044b16 100644 (file)
--- 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 6fbb84ba58454ac392dbae894d8569ec2d3b82b9..02654659a69f113e56a763e3a794afcba77ac953 100644 (file)
--- 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 bf14e5a44ec3929907cd5b01004a685cc65dcf86..ce59c6b6deba7e74f18139f8eed8736c22f97fd5 100644 (file)
--- 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 e5c96ba763f06a789019f076dfa3664a9ebb57d8..86a4f1f659668bac922980b5349644df14ef85f4 100644 (file)
--- 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 bd8ff5d2a1ccc55ebf55227467dcc90fd23327aa..22cc116ea14ddda166061b4609cef7a2c720e5ab 100644 (file)
--- 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 58390145c6c04565d6bdd10ba5ebe518474ff9d1..939746ce1998b79631f9a1175369f2180b495bd0 100644 (file)
--- 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 df18728f3ef9d8c9e89628a9ea159aa2675c0bfa..fe74c7fc9a8a0fbf89723c7a53ea1612a735982a 100644 (file)
--- 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 ac1c0d7d9d43e566823aa891c5761117f41bf805..b2b6b37aa620d95001941a3955311d4f6529e927 100644 (file)
--- 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 7ab4d20d6a988c028c263e60cd6dd8433d9cb69b..2932f8250ce152eca26c92e653ae42cba038d597 100644 (file)
--- 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 c395fcab966f9d2eda81da0b7e59734c21f20670..d3a1e70b4964f3874522002d3e9e309e06f893c4 100644 (file)
--- 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 2d99d0303dfae6c6a22ba6eddd5299a5f9d88903..f2f2ba372252ee16802ac9f2c37c91713c56ef8e 100644 (file)
--- 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 cde24561026040ee5990c0397d67d5892523cb96..d29ee01bc353c25270038e365639d73b0596839c 100644 (file)
--- 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 b9c37b1da3a296679f59f80143e20a03f7f6aa3c..40b58a2ad6e3d9bce7ee045673fe3cb6db61a2d9 100644 (file)
--- 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 e579f230fd89a30cdfd2047a7d3cee81aebd9d33..e7920c00af808df02b5dfec633c1b56ae077ba70 100644 (file)
--- 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 57bb5258e068c0d4ed27fa1cd437f1780ff5a45e..7cbe948d09013358e90a66d68ff8af33562d8ba8 100644 (file)
--- 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 a1841f140c1fd08efe3f01a5ecf74834e4f51e3b..42db1d32a066d401387dba8bcce26fe2714ddcda 100644 (file)
--- 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 f44cbcc001ea74e68ec450f2467e159b74e59d3b..86307610df2622cda329ed566eff32200bfb9bf3 100644 (file)
--- 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 ba7016c8e2ab9bb77582e459391ee9a954481a78..80fb8946c0a9c8493b500eba4b314d7c45cc462b 100644 (file)
--- 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 9b354eb338d7724dec10e085bfb41a30cc5a15b0..77bb9d62d73a777f4073dd811905830f170f2ce0 100644 (file)
--- 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 f8ec8a8e31de169e5583d183e49d7a8729730347..b478cb074e97da644b046565049f47ccbf03419b 100644 (file)
--- 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 f7e414a0fca8cd75350a20222c899eaaeb5c09f7..8f9c7be8eb67380984759c568f6f2a2d4a2cbb3c 100644 (file)
--- 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 24aff28b44cc5366d35c494f7f68d1d5bc13db5d..566dd75d1c6ffee864afd5092b5da46a21b69450 100644 (file)
--- 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 e949b77b9c17f5f4ceafcb15a122733b4cfd2cf3..cc53365bd46d934705697b206663678353f89b8c 100644 (file)
--- 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 64be8cc7e0734495a399b1757aa89b3078cf64a5..c0d0aad57587b0b77a631da7a7a0ea7b1d642632 100644 (file)
--- 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 d26ee0b70fc2f8a19c20fd48c8d0bd412436dc43..324e5386934c30938a30b1297900945050d28d6c 100644 (file)
--- 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 a9d0038520eeaed4dc7d8f3d3dc0ff3a408cdb91..2ad92a9c6d84d34a562fad4acdebdd5b40563b88 100644 (file)
--- 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 1473642ef7c5cc9001791fd26bc2e9d53f6d5803..8b3034a4cdb8f2de611eb427be3064c4b75a39f5 100644 (file)
--- 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 f0af9199d9b347a3ae6fd545102ab2bc0d3705bc..b6fb88d013a3f7c115ae79bd8870bf5f64871eeb 100644 (file)
--- 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 2fd39408495f1a58ff07488250c775dc03eb1cab..3d910739e17b7d07a7b3c7ffc3a3a616af2356ba 100644 (file)
--- 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 b1d156a7a9387e3f2d3775da37ac4f9c5d350d72..3558cd219850aa746715d676e0dae985b7cc1f98 100644 (file)
--- 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 c34fb6fe59d3b5313120d1ccdcf84d9e38356dd0..ef253b48bb78d20292b95180895071af600181ac 100644 (file)
--- 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 359fea7f57983ed55a148ba3937e6a2e55511708..e31f9ca0dd4cf99239b77e4298a7309c0b55bfac 100644 (file)
--- 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 e3142ef2436535bf7e8ad3148cfb575a0e236c7b..d711ab4566079a3e833c4c0a87ad92d68f514a43 100644 (file)
--- 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 31e223dbce18c6c3cd82af455f6951197be16370..213bd68c90ee641fe356631cd20d205327cff3c9 100644 (file)
--- 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 3cb953dc1ecbfbad7f71f65e140d4ce6a704ca14..439091a96ef993fd03759669c401e75e23589d63 100644 (file)
--- 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 6c0916005eac61a147a526cf0a7900fa5d90228d..3850d55d91f6e1348bc281bcb05c3c5c311c2ef6 100644 (file)
--- 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 6edbdba848d5fea9229ea76015410d2494e82077..b0cf8735196d432b335a1d1ef6355472b2b00106 100644 (file)
--- 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 90046b9016d8241439d96e40f77e8c0e373b3d25..42f4a46f3321042b9dabcaa06d1b471c1a3d2c77 100644 (file)
--- 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 c4a80af7eea0545254d9192657908e9352d70dc3..ab348ca4d0d898cf5607fdd80db7b1d18fe94e62 100644 (file)
--- 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 251258bcfb8e0f55e79e7c3baddeb95a79817c73..bb5eb8721187b3b8cce3a2fed36787037de643aa 100644 (file)
--- 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 8795985e18a2aecadfa4b8f5ab50d1b27eda8fe1..02ec93a3313ab9904a594d9a1159a861305d7535 100644 (file)
--- 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'],