picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

meson: add libblkid as libudev-core dep to fix include dir

Browse source 
Follow-up for 6b5cf3ea62.

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

v3:
- fix install_rpath for udevadm (Michael Biebl)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-17 19:33:10 -04:00
parent 37efbbd821
commit 1aec3ed90d
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -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]

17
src/udev/meson.build
View file

@ -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