Skip to content

Commit b40369e

Browse files
andrei-pavelandrei-pavel
committed
[#3731] Address review
1 parent 9935619 commit b40369e

File tree

20 files changed

+48
-28
lines changed

20 files changed

+48
-28
lines changed

‎fuzz/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ subdir('tests')
66

77
fuzz_sources = ['fuzz.cc', 'fuzz.h']
88
cpp_flags = [
9-
f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
10-
f'-DKEA_LFC_SOURCES="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
9+
f'-DKEA_LFC_INSTALLATION="@KEA_LFC_INSTALLED@"',
10+
f'-DKEA_LFC_SOURCES="@KEA_LFC_BUILT@"',
1111
]
1212
if FUZZING_WITH_CLUSTERFUZZLITE
1313
cpp_flags = ['-fsanitize=fuzzer', '-gdwarf-4']

‎meson.build

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,15 @@ PREFIX = get_option('prefix')
4545
SBINDIR = get_option('sbindir')
4646
SYSCONFDIR = get_option('sysconfdir')
4747

48-
DHCP_DATA_DIR = LOCALSTATEDIR / 'run/kea'
49-
DEFAULT_HOOKS_PATH = PREFIX / 'lib/kea/hooks'
50-
TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
5148
DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
49+
DHCP_DATA_DIR = LOCALSTATEDIR / 'run/kea'
50+
DEFAULT_HOOKS_PATH = PREFIX / LIBDIR / 'kea/hooks'
51+
KEA_ADMIN_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-admin'
52+
KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
53+
KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
54+
KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc'
5255
LEGAL_LOG_DIR = PREFIX / LOCALSTATEDIR / 'lib/kea'
56+
TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
5357

5458
#### Build Options
5559

‎src/bin/admin/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
kea_admin_conf_data = configuration_data()
22
kea_admin_conf_data.set('prefix', PREFIX)
3-
kea_admin_conf_data.set('exec_prefix', PREFIX)
4-
kea_admin_conf_data.set('datarootdir', PREFIX / DATADIR)
3+
kea_admin_conf_data.set('exec_prefix', '${prefix}')
4+
kea_admin_conf_data.set('datarootdir', '${prefix}/@DATADIR@')
55
kea_admin_conf_data.set('PACKAGE', 'kea')
66
kea_admin_conf_data.set('PACKAGE_NAME', 'kea')
77
kea_admin_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
88
kea_admin_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
99
kea_admin_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
1010
kea_admin_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
11-
kea_admin_conf_data.set('sbindir', PREFIX / SBINDIR)
11+
kea_admin_conf_data.set('sbindir', f'${prefix}/@SBINDIR@')
1212
kea_admin_conf_data.set('variables', 'variables')
1313
configure_file(
1414
input: 'kea-admin.in',

‎src/bin/agent/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ executable(
2020
dependencies: [CRYPTO_DEP],
2121
include_directories: [include_directories('.')] + INCLUDES,
2222
install: true,
23-
install_dir: 'sbin',
23+
install_dir: SBINDIR,
2424
link_with: [agent_lib] + LIBS_BUILT_SO_FAR,
2525
)
2626
subdir('tests')

‎src/bin/d2/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ executable(
2424
dependencies: [CRYPTO_DEP],
2525
include_directories: [include_directories('.')] + INCLUDES,
2626
install: true,
27-
install_dir: 'sbin',
27+
install_dir: SBINDIR,
2828
link_with: [d2_lib] + LIBS_BUILT_SO_FAR,
2929
)
3030
subdir('tests')

‎src/bin/dhcp4/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ kea_dhcp4 = executable(
1919
dependencies: [CRYPTO_DEP],
2020
include_directories: [include_directories('.')] + INCLUDES,
2121
install: true,
22-
install_dir: 'sbin',
22+
install_dir: SBINDIR,
2323
link_with: [dhcp4_lib] + LIBS_BUILT_SO_FAR,
2424
)
2525
subdir('tests')

‎src/bin/dhcp4/tests/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ kea_dhcp4_tests = executable(
138138
f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea4"',
139139
f'-DDHCP_DATA_DIR="@current_build_dir@"',
140140
f'-DSYNTAX_FILE="@current_source_dir@/../dhcp4_parser.yy"',
141-
f'-DKEA_LFC_EXECUTABLE="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
141+
f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_BUILT@"',
142142
f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
143143
],
144144
dependencies: dhcp4_tests_deps,

‎src/bin/dhcp6/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ kea_dhcp6 = executable(
2020
dependencies: [CRYPTO_DEP],
2121
include_directories: [include_directories('.')] + INCLUDES,
2222
install: true,
23-
install_dir: 'sbin',
23+
install_dir: SBINDIR,
2424
link_with: [dhcp6_lib] + LIBS_BUILT_SO_FAR,
2525
)
2626
subdir('tests')

‎src/bin/dhcp6/tests/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ kea_dhcp6_tests = executable(
140140
f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea6"',
141141
f'-DDHCP_DATA_DIR="@current_build_dir@"',
142142
f'-DSYNTAX_FILE="@current_source_dir@/../dhcp6_parser.yy"',
143-
f'-DKEA_LFC_EXECUTABLE="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
143+
f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_BUILT@"',
144144
f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
145145
],
146146
dependencies: dhcp6_tests_deps,

‎src/bin/keactrl/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
keactrl_conf_data = configuration_data()
22
keactrl_conf_data.set('prefix', PREFIX)
3-
keactrl_conf_data.set('sysconfdir', PREFIX / SYSCONFDIR)
3+
keactrl_conf_data.set('sysconfdir', '${prefix}/@SYSCONFDIR@')
44
keactrl_conf_data.set('PACKAGE', 'kea')
5-
keactrl_conf_data.set('exec_prefix', PREFIX)
6-
keactrl_conf_data.set('sbindir', PREFIX / SBINDIR)
5+
keactrl_conf_data.set('exec_prefix', '${prefix}')
6+
keactrl_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
77
if NETCONF_DEP.found()
88
keactrl_conf_data.set('HAVE_NETCONF', 'yes')
99
else

‎src/bin/lfc/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ kea_lfc = executable(
1010
'main.cc',
1111
include_directories: [include_directories('.')] + INCLUDES,
1212
install: true,
13-
install_dir: 'sbin',
13+
install_dir: SBINDIR,
1414
link_with: [lfc_lib] + LIBS_BUILT_SO_FAR,
1515
)
1616
subdir('tests')

‎src/bin/netconf/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ executable(
3131
dependencies: [NETCONF_DEP, CRYPTO_DEP],
3232
include_directories: [include_directories('.')] + INCLUDES,
3333
install: true,
34-
install_dir: 'sbin',
34+
install_dir: SBINDIR,
3535
link_with: [netconf_lib] + LIBS_BUILT_SO_FAR,
3636
override_options: ['cpp_std=c++20'],
3737
)

‎src/bin/perfdhcp/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ executable(
1818
'main.cc',
1919
include_directories: [include_directories('.')] + INCLUDES,
2020
install: true,
21-
install_dir: 'sbin',
21+
install_dir: SBINDIR,
2222
link_with: [perfdhcp_lib] + LIBS_BUILT_SO_FAR,
2323
)
2424
subdir('tests')

‎src/lib/dhcpsrv/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ kea_dhcpsrv_lib = shared_library(
9393
sources,
9494
cpp_args: [
9595
f'-DDHCP_DATA_DIR="@PREFIX@/@DHCP_DATA_DIR@"',
96-
f'-DKEA_LFC_EXECUTABLE="@PREFIX@/@SBINDIR@/kea-lfc"',
96+
f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_INSTALLED@"',
9797
],
9898
dependencies: [CRYPTO_DEP],
9999
include_directories: [include_directories('.')] + INCLUDES,

‎src/lib/dhcpsrv/tests/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ kea_dhcpsrv_tests = executable(
131131
cpp_args: [
132132
f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
133133
f'-DDHCP_DATA_DIR="@current_build_dir@"',
134-
f'-DKEA_LFC_BUILD_DIR="@TOP_BUILD_DIR@/src/bin/lfc"',
134+
f'-DKEA_LFC_BUILD_DIR="@KEA_LFC_BUILT@"',
135135
f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"',
136136
],
137137
dependencies: [CRYPTO_DEP, GTEST_DEP],

‎src/lib/mysql/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kea_mysql_lib = shared_library(
66
'kea-mysql',
77
'mysql_binding.cc',
88
'mysql_connection.cc',
9-
cpp_args: [f'-DKEA_ADMIN="@PREFIX@/@SBINDIR@/kea-admin"'],
9+
cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN_INSTALLED@"'],
1010
dependencies: [MYSQL_DEP],
1111
include_directories: [include_directories('.')] + INCLUDES,
1212
install: true,

‎src/lib/mysql/tests/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ kea_mysql_tests = executable(
1414
'run_unittests.cc',
1515
cpp_args: [
1616
f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
17-
f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"',
17+
f'-DKEA_ADMIN="@KEA_ADMIN_BUILT@"',
1818
],
1919
dependencies: [GTEST_DEP, MYSQL_DEP],
2020
include_directories: [include_directories('.')] + INCLUDES,

‎src/lib/pgsql/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kea_pgsql_lib = shared_library(
66
'kea-pgsql',
77
'pgsql_connection.cc',
88
'pgsql_exchange.cc',
9-
cpp_args: [f'-DKEA_ADMIN="@PREFIX@/@SBINDIR@/kea-admin"'],
9+
cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN_INSTALLED@"'],
1010
dependencies: [POSTGRESQL_DEP],
1111
include_directories: [include_directories('.')] + INCLUDES,
1212
install: true,

‎src/lib/pgsql/tests/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ kea_pgsql_tests = executable(
1515
'run_unittests.cc',
1616
cpp_args: [
1717
f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
18-
f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"',
18+
f'-DKEA_ADMIN="@KEA_ADMIN_BUILT@"',
1919
],
2020
dependencies: [GTEST_DEP, POSTGRESQL_DEP],
2121
include_directories: [include_directories('.')] + INCLUDES,

‎subprojects/krb5/meson.build

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,27 @@ krb5 = disabler()
44
krb5_config = find_program('krb5-config', required: false)
55

66
if krb5_config.found()
7+
# Detect vendor.
8+
vendor_cmd = run_command([krb5_config, '--vendor'], check: false)
9+
vendor = 'unknown'
10+
if vendor_cmd.returncode() == 0
11+
vendor = vendor_cmd.stdout().strip()
12+
else
13+
all = run_command([krb5_config, '--all'], check: false)
14+
if all.returncode() == 0
15+
foreach i : all.stdout().split('\n')
16+
if i.startswith('Vendor')
17+
vendor = i.split(':')[1].strip()
18+
break
19+
endif
20+
endforeach
21+
endif
22+
endif
23+
724
cflags = run_command([krb5_config, '--cflags', 'gssapi'], check: false)
825
libs = run_command([krb5_config, '--libs', 'gssapi'], check: false)
926
version = run_command([krb5_config, '--version'], check: false)
10-
vendor = run_command([krb5_config, '--vendor'], check: false)
11-
if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 and vendor.returncode() == 0
27+
if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0
1228
krb5_version = version.stdout().strip()
1329
krb5 = declare_dependency(
1430
compile_args: cflags.stdout().split(),

0 commit comments

Comments
 (0)