From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 18 Oct 2021 08:13:07 +0000 (+0200)
Subject: meson: use partial_dependency() to get include directory
X-Git-Tag: v250-rc1~480
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfa0ade9f208c5426655a8c09f633eb0984b4b01;p=thirdparty%2Fsystemd.git

meson: use partial_dependency() to get include directory

Getting the variable directly from pkg-config (without
adding the sysroot prefix) is prone to host contamination
when building in sysroots as the compiler starts looking for the
headers on the host in addition to the sysroot.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---

diff --git a/meson.build b/meson.build
index df53c6156dd..f1be04e5aea 100644
--- a/meson.build
+++ b/meson.build
@@ -2618,18 +2618,17 @@ endif
 
 if conf.get('ENABLE_LOCALED') == 1
         if conf.get('HAVE_XKBCOMMON') == 1
-                # logind will load libxkbcommon.so dynamically on its own
-                deps = [libdl]
-                extra_includes = [libxkbcommon.get_pkgconfig_variable('includedir')]
+                # logind will load libxkbcommon.so dynamically on its own, but we still
+                # need to specify where the headers are
+                deps = [libdl, libxkbcommon.partial_dependency(compile_args: true)]
         else
                 deps = []
-                extra_includes = []
         endif
 
         executable(
                 'systemd-localed',
                 systemd_localed_sources,
-                include_directories : includes + extra_includes,
+                include_directories : includes,
                 link_with : [libshared],
                 dependencies : deps,
                 install_rpath : rootlibexecdir,