1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
Use bind-tools option to ease the server/tools package split
--- meson.build.orig 2025-10-18 09:48:52 UTC
+++ meson.build
@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib')
tracing_opt = get_option('tracing')
zlib_opt = get_option('zlib')
+bind_tools = get_option('bind-tools').enabled()
+
if meson.version().version_compare('>=1.1.0')
build_options = meson.build_options()
if build_options == ''
@@ -408,7 +410,7 @@ if fuzz_opt.enabled()
fuzz_link_args = []
if fuzz_opt.enabled()
- if fuzz_backed_opt != 'none'
+ if fuzz_backend_opt != 'none'
if get_option('b_lundef') != false
warning('fuzzing will fail to build properly without -Db_lundef=false')
endif
@@ -1222,6 +1224,7 @@ libisccfg_dep = declare_dependency(
include_directories: isccfg_inc,
)
+if bind_tools
executable(
'arpaname',
arpaname_src,
@@ -1434,7 +1437,9 @@ executable(
libisc_dep,
],
)
+endif
+if not bind_tools
executable(
'named-checkconf',
named_checkconf_src,
@@ -1507,7 +1512,9 @@ endif
],
)
endif
+endif
+if bind_tools
executable(
'named-rrchecker',
named_rrchecker_src,
@@ -1520,6 +1527,7 @@ executable(
],
)
+endif
named_c_args = []
named_link_args = []
@@ -1559,6 +1567,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
named_srcconf = named_srcset.apply(config, strict: false)
+if not bind_tools
executable(
'named',
named_srcconf.sources(),
@@ -1586,7 +1595,9 @@ executable(
named_srcconf.dependencies(),
],
)
-
+endif
+
+if bind_tools
executable(
'nsec3hash',
nsec3hash_src,
@@ -1631,7 +1642,9 @@ executable(
edit_dep,
],
)
-
+endif
+
+if not bind_tools
executable(
'rndc-confgen',
rndc_confgen_src,
@@ -1727,6 +1740,7 @@ shared_library(
libns_dep,
],
)
+endif
subdir('doc')
subdir('tests')
@@ -1795,7 +1809,6 @@ print(release_date, end="")
print(release_date, end="")
'''
-if doc_opt.allowed()
release_date = ''
if python.found()
release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
@@ -1816,6 +1829,7 @@ if doc_opt.allowed()
install_man(man_pages)
+if doc_opt.allowed()
if sphinx_build.found()
alias_target('doc-misc', doc_misc_targets)
|
