From 1aec3ed90d553482918b283e52b82918d7f5a388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Mon, 17 Apr 2017 19:33:10 -0400
Subject: [PATCH] meson: add libblkid as libudev-core dep to fix include dir

Follow-up for 6b5cf3ea62.

v2:
- also link udevadm and systemd-udev statically if requested

v3:
- fix install_rpath for udevadm (Michael Biebl)
---
 meson.build          | 10 ++++------
 src/udev/meson.build | 17 +++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index a9011e50d20..b1deb321445 100644
--- a/meson.build
+++ b/meson.build
@@ -2017,15 +2017,14 @@ exe = executable('systemd-udevd',
                  systemd_udevd_sources,
                  include_directories : includes,
                  link_with : [libudev_core,
-                              libudev_internal,
                               libsystemd_network,
-                              libshared],
+                              libudev_internal],
                  dependencies : [threads,
                                  libkmod,
                                  libidn,
                                  libacl,
                                  libblkid],
-                 install_rpath : rootlibexecdir,
+                 install_rpath : udev_rpath,
                  install : true,
                  install_dir : rootlibexecdir)
 public_programs += [exe]
@@ -2034,15 +2033,14 @@ exe = executable('udevadm',
                  udevadm_sources,
                  include_directories : includes,
                  link_with : [libudev_core,
-                              libudev_internal,
                               libsystemd_network,
-                              libshared],
+                              libudev_internal],
                  dependencies : [threads,
                                  libkmod,
                                  libidn,
                                  libacl,
                                  libblkid],
-                 install_rpath : rootlibexecdir,
+                 install_rpath : udev_rpath,
                  install : true,
                  install_dir : rootbindir)
 public_programs += [exe]
diff --git a/src/udev/meson.build b/src/udev/meson.build
index e3d3fa24627..495e9d3c54c 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -91,19 +91,19 @@ link_config_gperf_c = custom_target(
 ############################################################
 
 if get_option('link-udev-shared')
-        libudev_link_with = [libshared]
-        rpath = rootlibexecdir
+        udev_link_with = [libshared]
+        udev_rpath = rootlibexecdir
 else
-        libudev_link_with = [libshared_static,
-                             libsystemd_internal]
-        rpath = ''
+        udev_link_with = [libshared_static,
+                          libsystemd_internal]
+        udev_rpath = ''
 endif
 
 libudev_internal = static_library(
         'udev',
         libudev_sources,
         include_directories : includes,
-        link_with : libudev_link_with)
+        link_with : udev_link_with)
 
 libudev_core_includes = [includes, include_directories('net')]
 libudev_core = static_library(
@@ -112,7 +112,8 @@ libudev_core = static_library(
         link_config_gperf_c,
         keyboard_keys_from_name_h,
         include_directories : libudev_core_includes,
-        link_with : libudev_link_with)
+        link_with : udev_link_with,
+        dependencies : [libblkid])
 
 foreach prog : [['ata_id/ata_id.c'],
                 ['cdrom_id/cdrom_id.c'],
@@ -130,7 +131,7 @@ foreach prog : [['ata_id/ata_id.c'],
                    prog,
                    include_directories : includes,
                    link_with : [libudev_internal],
-                   install_rpath : rpath,
+                   install_rpath : udev_rpath,
                    install : true,
                    install_dir : udevlibexecdir)
 endforeach