shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-10 16:58:28 +03:00
Code

meson: fix compilation with -Dnetworkd=false, -Dkmod=no, -Dlibgcrypt=no

Browse Source 
The tests are included under the conditional too, instead of specifying
'ENABLE_NETWORKD' in the test definition array, because libnetworkd_core
dependency is undefined if networkd is disabled.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-12 12:14:30 -04:00
parent 421f001277
commit f0bd7cc701
3 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
meson.build
View File

@ -855,7 +855,7 @@ if want_importd != 'no'
conf.get('HAVE_ZLIB', 0) == 1 and
conf.get('HAVE_BZIP2', 0) == 1 and
conf.get('HAVE_XZ', 0) == 1 and
conf.get('HAVE_LZ4', 0) == 1)
conf.get('HAVE_LIBGCRYPT', 0) == 1)
if have_deps
conf.set('ENABLE_IMPORTD', 1)
elif want_importd == 'yes'
@ -2030,28 +2030,30 @@ executable('systemd-nspawn',
install_rpath : rootlibexecdir,
install : true)
executable('systemd-networkd',
systemd_networkd_sources,
include_directories : includes,
link_with : [libnetworkd_core,
libfirewall,
libsystemd_network,
libudev_internal,
libshared,
libsystemd_internal],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
if conf.get('ENABLE_NETWORKD', 0) == 1
executable('systemd-networkd',
systemd_networkd_sources,
include_directories : includes,
link_with : [libnetworkd_core,
libfirewall,
libsystemd_network,
libudev_internal,
libshared,
libsystemd_internal],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
executable('systemd-networkd-wait-online',
systemd_networkd_wait_online_sources,
include_directories : includes,
link_with : [libnetworkd_core,
libshared,
libsystemd_internal],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
executable('systemd-networkd-wait-online',
systemd_networkd_wait_online_sources,
include_directories : includes,
link_with : [libnetworkd_core,
libshared,
libsystemd_internal],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
endif
executable('networkctl',
networkctl_sources,

52
src/network/meson.build
View File

@ -110,33 +110,33 @@ if conf.get('ENABLE_NETWORKD', 0) == 1
install_dir : dbussystemservicedir)
install_data('systemd-networkd.rules',
install_dir : polkitrulesdir)
endif
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network,
libudev],
[]],
tests += [
[['src/network/test-networkd-conf.c'],
[libnetworkd_core,
libsystemd_network,
libudev],
[]],
[['src/network/test-network.c'],
[libnetworkd_core,
libudev_internal,
libsystemd_network,
libsystemd_internal,
libfirewall],
[libiptc]],
[['src/network/test-network.c'],
[libnetworkd_core,
libudev_internal,
libsystemd_network,
libsystemd_internal,
libfirewall],
[libiptc]],
[['src/network/test-network-tables.c',
'src/network/test-network-tables.c',
test_tables_h],
[libnetworkd_core,
libudev_internal,
libudev_core,
libsystemd_network,
libsystemd_internal,
libfirewall],
[],
'', '', [],
[network_include_dir] + libudev_core_includes],
[['src/network/test-network-tables.c',
'src/network/test-network-tables.c',
test_tables_h],
[libnetworkd_core,
libudev_internal,
libudev_core,
libsystemd_network,
libsystemd_internal,
libfirewall],
[],
'', '', [],
[network_include_dir] + libudev_core_includes],
]
endif

2
src/test/meson.build
View File

@ -424,7 +424,7 @@ tests += [
[libshared,
libsystemd_internal],
[libkmod],
'', 'manual'],
'HAVE_KMOD', 'manual'],
[['src/test/test-ellipsize.c'],
[libshared],