diff options
Diffstat (limited to 'dns/bind9-devel/files/patch-meson.build')
| -rw-r--r-- | dns/bind9-devel/files/patch-meson.build | 47 |
1 files changed, 18 insertions, 29 deletions
diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build index 93ec124f974a..cb4803b883bd 100644 --- a/dns/bind9-devel/files/patch-meson.build +++ b/dns/bind9-devel/files/patch-meson.build @@ -1,26 +1,17 @@ Use bind-tools option to ease the server/tools package split ---- meson.build.orig 2025-10-18 09:48:52 UTC +--- meson.build.orig 2025-11-07 09:34:27 UTC +++ meson.build -@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib') +@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer tracing_opt = get_option('tracing') - zlib_opt = get_option('zlib') + zlib_opt = get_option('zlib').enable_auto_if(developer_mode) +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( + build_options = meson.build_options() + if build_options == '' + build_options = 'default' +@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency( include_directories: isccfg_inc, ) @@ -28,7 +19,7 @@ Use bind-tools option to ease the server/tools package split executable( 'arpaname', arpaname_src, -@@ -1434,7 +1437,9 @@ executable( +@@ -1427,7 +1430,9 @@ executable( libisc_dep, ], ) @@ -38,7 +29,7 @@ Use bind-tools option to ease the server/tools package split executable( 'named-checkconf', named_checkconf_src, -@@ -1507,7 +1512,9 @@ endif +@@ -1501,7 +1506,9 @@ endif ], ) endif @@ -48,15 +39,15 @@ Use bind-tools option to ease the server/tools package split executable( 'named-rrchecker', named_rrchecker_src, -@@ -1520,6 +1527,7 @@ executable( +@@ -1514,6 +1521,7 @@ executable( ], ) +endif - named_c_args = [] - named_link_args = [] -@@ -1559,6 +1567,7 @@ named_srcconf = named_srcset.apply(config, strict: fal + named_deps = [] + +@@ -1551,6 +1559,7 @@ named_srcconf = named_srcset.apply(config, strict: fal named_srcconf = named_srcset.apply(config, strict: false) @@ -64,29 +55,27 @@ Use bind-tools option to ease the server/tools package split executable( 'named', named_srcconf.sources(), -@@ -1586,7 +1595,9 @@ executable( +@@ -1578,7 +1587,9 @@ executable( named_srcconf.dependencies(), ], ) -- +endif -+ + +if bind_tools executable( 'nsec3hash', nsec3hash_src, -@@ -1631,7 +1642,9 @@ executable( +@@ -1623,7 +1634,9 @@ executable( edit_dep, ], ) -- +endif -+ + +if not bind_tools executable( 'rndc-confgen', rndc_confgen_src, -@@ -1727,6 +1740,7 @@ shared_library( +@@ -1719,6 +1732,7 @@ shared_library( libns_dep, ], ) |