From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 7 Dec 2022 11:19:41 +0000 (+0100)
Subject: meson: utilize the version bump
X-Git-Tag: v6.1.0~14^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13235612644;p=thirdparty%2Fknot-resolver.git

meson: utilize the version bump
---

diff --git a/meson.build b/meson.build
index baac8abf6..5d86aa767 100644
--- a/meson.build
+++ b/meson.build
@@ -167,9 +167,7 @@ endif
 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 1dfd87e71..5415a4efe 100644
--- 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 7e0be7b07..046304f01 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -39,7 +39,6 @@ foreach unit_test : unit_tests
     'unit.' + unit_test[0],
     exec_test,
     suite: [ 'unit' ] + extra_suites,
-    # they take very short time
-    kwargs: meson.version().version_compare('<0.52') ? {} : { 'priority': -5 },
+    priority: -5, # they take very short time
   )
 endforeach