From 3c428597cc49b305dbe05ece20fca5bceaeb4f4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 7 Dec 2022 12:19:41 +0100 Subject: [PATCH] meson: utilize the version bump --- meson.build | 4 +--- tests/dnstap/meson.build | 3 +-- tests/unit/meson.build | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index ed43541c8..41a44aa2a 100644 --- 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 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 b10789cc2..9477262df 100644 --- 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 -- 2.47.2