meson: utilize the version bump

diff --git a/meson.build b/meson.build
index ed43541c85e7ef2a34d976742dab2af00a9979c4..41a44aa2a072b498effe4433181cb86ee94a308c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -131,9 +131,7 @@ malloc_name = get_option('malloc') == 'disabled' ? '' : 'jemalloc'
 malloc = meson.get_compiler('c').find_library(
   malloc_name,
   required: get_option('malloc') == 'jemalloc',
-  #static: false, #TODO: add when bumping meson to >= 0.51;
-  # static linking would most likely cause issues.
-  # Fortunately it seems unlikely that dynamic wouldn't be found and static would be.
+  static: false, # static linking would most likely cause issues.
 )
 
 summary({'sendmmsg': sendmmsg,

diff --git a/tests/dnstap/meson.build b/tests/dnstap/meson.build
index 1dfd87e71b9ee3b3599ed3ac8032ae6af4c1bcd5..5415a4efe1f8a1f5f02467236f5b21ce05b171dd 100644 (file)
--- a/tests/dnstap/meson.build
+++ b/tests/dnstap/meson.build
@@ -5,7 +5,6 @@ test('dnstap',
   args: [ sbin_dir / 'kresd' ],
   suite: [ 'postinstall', 'dnstap' ],
   timeout: 120, # it may need to fetch go packages, etc.
-  # it takes relatively long time
-  kwargs: meson.version().version_compare('<0.52') ? {} : { 'priority': 5 },
+  priority: 5, # it takes relatively long time
 )
 

diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index b10789cc2a8448788e1a762fd787e5f4cdb5bfae..9477262df8a2304ec3e5ec9647485e41c97e0089 100644 (file)
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -31,7 +31,6 @@ foreach unit_test : unit_tests
     'unit.' + unit_test[0],
     exec_test,
     suite: 'unit',
-    # they take very short time
-    kwargs: meson.version().version_compare('<0.52') ? {} : { 'priority': -5 },
+    priority: -5, # they take very short time
   )
 endforeach