| Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame^] | 1 | From 44516eee75696c84849c0f7aa632e2456b101813 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 26 Mar 2022 00:57:03 -0700 |
| 4 | Subject: [PATCH] meson: Use pkg-config to detect iniparser |
| 5 | |
| 6 | Add iniparser dependency to util subdir |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | meson.build | 2 +- |
| 12 | util/meson.build | 1 + |
| 13 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/meson.build b/meson.build |
| 16 | index 42e11aa..4209320 100644 |
| 17 | --- a/meson.build |
| 18 | +++ b/meson.build |
| 19 | @@ -160,7 +160,7 @@ cc = meson.get_compiler('c') |
| 20 | |
| 21 | # keyutils and iniparser lack pkgconfig |
| 22 | keyutils = cc.find_library('keyutils', required : get_option('keyutils')) |
| 23 | -iniparser = cc.find_library('iniparser', required : true) |
| 24 | +iniparser = dependency('iniparser', required : true) |
| 25 | |
| 26 | conf = configuration_data() |
| 27 | check_headers = [ |
| 28 | diff --git a/util/meson.build b/util/meson.build |
| 29 | index 784b279..8e9ae9a 100644 |
| 30 | --- a/util/meson.build |
| 31 | +++ b/util/meson.build |
| 32 | @@ -12,5 +12,6 @@ util = static_library('util', [ |
| 33 | 'iomem.c', |
| 34 | ], |
| 35 | include_directories : root_inc, |
| 36 | + dependencies : iniparser, |
| 37 | ) |
| 38 | util_dep = declare_dependency(link_with : util) |
| 39 | -- |
| 40 | 2.35.1 |
| 41 | |