Path: blob/main/dns/bind9-devel/files/patch-meson.build
16462 views
Use bind-tools option to ease the server/tools package split12--- meson.build.orig 2025-08-13 17:10:38 UTC3+++ meson.build4@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib')5tracing_opt = get_option('tracing')6zlib_opt = get_option('zlib')78+bind_tools = get_option('bind-tools').enabled()9+10if meson.version().version_compare('>=1.1.0')11build_options = meson.build_options()12if build_options == ''13@@ -976,9 +978,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false)1415isc_srcconf = isc_srcset.apply(config, strict: false)1617+project_version = meson.project_version()18+soversion_parts = project_version.split('.') # ['1', '2', '3']19+soversion = '@0@.@1@'.format(soversion_parts[0], soversion_parts[1])20+21libisc = library(22'isc',23isc_srcconf.sources(),24+ version: project_version,25+ soversion: soversion,26objects: isc_probe_objects,27install: true,28install_rpath: libdir,29@@ -1006,6 +1014,8 @@ libdns = library(30libdns = library(31'dns',32dns_srcconf.sources(),33+ version: project_version,34+ soversion: soversion,35include_directories: dns_inc,36install: true,37install_rpath: libdir,38@@ -1040,6 +1050,8 @@ libns = library(39libns = library(40'ns',41ns_srcconf.sources(),42+ version: project_version,43+ soversion: soversion,44objects: ns_probe_objects,45install: true,46install_rpath: libdir,47@@ -1066,6 +1078,8 @@ libisccc = library(48libisccc = library(49'isccc',50isccc_srcconf.sources(),51+ version: project_version,52+ soversion: soversion,53implicit_include_directories: false,54include_directories: isccc_inc,55install: true,56@@ -1087,6 +1101,8 @@ libisccfg = library(57libisccfg = library(58'isccfg',59isccfg_srcconf.sources(),60+ version: project_version,61+ soversion: soversion,62implicit_include_directories: false,63include_directories: isccfg_inc,64install: true,65@@ -1107,6 +1123,7 @@ named_srcconf = named_srcset.apply(config, strict: fal6667named_srcconf = named_srcset.apply(config, strict: false)6869+if bind_tools70executable(71'arpaname',72arpaname_src,73@@ -1335,7 +1352,9 @@ executable(74libisc_dep,75],76)77+endif7879+if not bind_tools80executable(81'named-checkconf',82named_checkconf_src,83@@ -1413,7 +1432,9 @@ endif84],85)86endif87+endif8889+if bind_tools90executable(91'named-rrchecker',92named_rrchecker_src,93@@ -1427,7 +1448,9 @@ executable(94],9596)97+endif9899+if not bind_tools100executable(101'named',102named_srcconf.sources(),103@@ -1458,7 +1481,9 @@ executable(104named_srcconf.dependencies(),105],106)107+endif108109+if bind_tools110executable(111'nsec3hash',112nsec3hash_src,113@@ -1506,7 +1531,9 @@ executable(114edit_dep,115],116)117+endif118119+if not bind_tools120executable(121'rndc-confgen',122rndc_confgen_src,123@@ -1592,6 +1619,7 @@ shared_library(124libns_dep,125],126)127+endif128129subdir('doc')130subdir('tests')131@@ -1659,7 +1687,6 @@ print(release_date, end="")132print(release_date, end="")133'''134135-if doc_opt.allowed()136release_date = ''137if python.found()138release_date = run_command(python, ['-c', get_release_date], check: true).stdout()139@@ -1680,6 +1707,7 @@ if doc_opt.allowed()140141install_man(man_pages)142143+if doc_opt.allowed()144if sphinx_build.found()145alias_target('doc-misc', doc_misc_targets)146147148149