mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
meson: Introduce userspace dep
This will help in a later commit to separate userspace from EFI builds.
This commit is contained in:
parent
f69edd6faf
commit
9214828313
475
meson.build
475
meson.build
File diff suppressed because it is too large
Load diff
|
@ -262,10 +262,11 @@ libbasic = static_library(
|
||||||
basic_sources,
|
basic_sources,
|
||||||
fundamental_sources,
|
fundamental_sources,
|
||||||
include_directories : basic_includes,
|
include_directories : basic_includes,
|
||||||
dependencies : [versiondep,
|
dependencies : [libcap,
|
||||||
|
libm,
|
||||||
threads,
|
threads,
|
||||||
libcap,
|
userspace,
|
||||||
libm],
|
versiondep],
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
@ -281,7 +282,8 @@ libbasic_gcrypt = static_library(
|
||||||
'basic-gcrypt',
|
'basic-gcrypt',
|
||||||
basic_gcrypt_sources,
|
basic_gcrypt_sources,
|
||||||
include_directories : basic_includes,
|
include_directories : basic_includes,
|
||||||
dependencies : [libgcrypt],
|
dependencies : [libgcrypt,
|
||||||
|
userspace],
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
@ -297,8 +299,9 @@ libbasic_compress = static_library(
|
||||||
'basic-compress',
|
'basic-compress',
|
||||||
basic_compress_sources,
|
basic_compress_sources,
|
||||||
include_directories : basic_includes,
|
include_directories : basic_includes,
|
||||||
dependencies : [libxz,
|
dependencies : [liblz4,
|
||||||
|
libxz,
|
||||||
libzstd,
|
libzstd,
|
||||||
liblz4],
|
userspace],
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
|
@ -120,19 +120,20 @@ libcore = shared_library(
|
||||||
link_args : ['-shared',
|
link_args : ['-shared',
|
||||||
'-Wl,--version-script=' + libshared_sym_path],
|
'-Wl,--version-script=' + libshared_sym_path],
|
||||||
link_with : libshared,
|
link_with : libshared,
|
||||||
dependencies : [versiondep,
|
dependencies : [libacl,
|
||||||
threads,
|
libapparmor,
|
||||||
|
libaudit,
|
||||||
|
libblkid,
|
||||||
libdl,
|
libdl,
|
||||||
|
libkmod,
|
||||||
|
libmount,
|
||||||
|
libpam,
|
||||||
librt,
|
librt,
|
||||||
libseccomp,
|
libseccomp,
|
||||||
libpam,
|
|
||||||
libaudit,
|
|
||||||
libkmod,
|
|
||||||
libapparmor,
|
|
||||||
libselinux,
|
libselinux,
|
||||||
libmount,
|
threads,
|
||||||
libblkid,
|
userspace,
|
||||||
libacl],
|
versiondep],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : rootpkglibdir)
|
install_dir : rootpkglibdir)
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ lib_cryptsetup_token_common = static_library(
|
||||||
'cryptsetup-token-common',
|
'cryptsetup-token-common',
|
||||||
'cryptsetup-token-util.c',
|
'cryptsetup-token-util.c',
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
dependencies : userspace,
|
||||||
link_with : libshared,
|
link_with : libshared,
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,8 @@ if conf.get('ENABLE_IMPORTD') == 1
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : [libbzip2,
|
dependencies : [libbzip2,
|
||||||
libxz,
|
libxz,
|
||||||
libz],
|
libz,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
install_data('org.freedesktop.import1.conf',
|
install_data('org.freedesktop.import1.conf',
|
||||||
|
|
|
@ -22,11 +22,12 @@ libsystemd_journal_remote = static_library(
|
||||||
libsystemd_journal_remote_sources,
|
libsystemd_journal_remote_sources,
|
||||||
include_directories : journal_includes,
|
include_directories : journal_includes,
|
||||||
link_with : libjournal_core,
|
link_with : libjournal_core,
|
||||||
dependencies : [threads,
|
dependencies : [libgnutls,
|
||||||
|
liblz4,
|
||||||
libmicrohttpd,
|
libmicrohttpd,
|
||||||
libgnutls,
|
|
||||||
libxz,
|
libxz,
|
||||||
liblz4],
|
threads,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
systemd_journal_remote_sources = files('journal-remote-main.c')
|
systemd_journal_remote_sources = files('journal-remote-main.c')
|
||||||
|
|
|
@ -25,7 +25,8 @@ libjournal_core = static_library(
|
||||||
'journal-core',
|
'journal-core',
|
||||||
sources,
|
sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies: threads,
|
dependencies: [threads,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
journal_includes = [includes, include_directories('.')]
|
journal_includes = [includes, include_directories('.')]
|
||||||
|
|
|
@ -32,6 +32,7 @@ libsystemd_network = static_library(
|
||||||
'systemd-network',
|
'systemd-network',
|
||||||
sources,
|
sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
dependencies : userspace,
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
libsystemd_network_includes = [includes, include_directories('.')]
|
libsystemd_network_includes = [includes, include_directories('.')]
|
||||||
|
|
|
@ -122,7 +122,8 @@ libsystemd_static = static_library(
|
||||||
link_with : [libbasic,
|
link_with : [libbasic,
|
||||||
libbasic_compress],
|
libbasic_compress],
|
||||||
dependencies : [threads,
|
dependencies : [threads,
|
||||||
librt],
|
librt,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
libsystemd_sym = files('libsystemd.sym')
|
libsystemd_sym = files('libsystemd.sym')
|
||||||
|
|
|
@ -25,6 +25,7 @@ libudev_basic = static_library(
|
||||||
'udev-basic',
|
'udev-basic',
|
||||||
libudev_sources,
|
libudev_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
dependencies : userspace,
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,8 @@ liblogind_core = static_library(
|
||||||
'logind-core',
|
'logind-core',
|
||||||
liblogind_core_sources,
|
liblogind_core_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : libacl,
|
dependencies : [libacl,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
loginctl_sources = files(
|
loginctl_sources = files(
|
||||||
|
|
|
@ -18,7 +18,8 @@ libmachine_core = static_library(
|
||||||
'machine-core',
|
'machine-core',
|
||||||
libmachine_core_sources,
|
libmachine_core_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : threads,
|
dependencies : [threads,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
if conf.get('ENABLE_MACHINED') == 1
|
if conf.get('ENABLE_MACHINED') == 1
|
||||||
|
|
|
@ -146,6 +146,7 @@ libnetworkd_core = static_library(
|
||||||
'networkd-core',
|
'networkd-core',
|
||||||
sources,
|
sources,
|
||||||
include_directories : network_includes,
|
include_directories : network_includes,
|
||||||
|
dependencies : userspace,
|
||||||
link_with : networkd_link_with,
|
link_with : networkd_link_with,
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,8 @@ libnspawn_core = static_library(
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : [libacl,
|
dependencies : [libacl,
|
||||||
libseccomp,
|
libseccomp,
|
||||||
libselinux],
|
libselinux,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
systemd_nspawn_sources = files('nspawn.c')
|
systemd_nspawn_sources = files('nspawn.c')
|
||||||
|
|
|
@ -85,6 +85,7 @@ libsystemd_resolve_core = static_library(
|
||||||
'systemd-resolve-core',
|
'systemd-resolve-core',
|
||||||
basic_dns_sources,
|
basic_dns_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
dependencies : userspace,
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
systemd_resolved_sources += custom_target(
|
systemd_resolved_sources += custom_target(
|
||||||
|
|
|
@ -296,7 +296,8 @@ libshared_static = static_library(
|
||||||
libshared_name,
|
libshared_name,
|
||||||
shared_sources,
|
shared_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : libshared_deps,
|
dependencies : [libshared_deps,
|
||||||
|
userspace],
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
@ -310,7 +311,8 @@ libshared = shared_library(
|
||||||
libbasic,
|
libbasic,
|
||||||
libbasic_gcrypt,
|
libbasic_gcrypt,
|
||||||
libsystemd_static],
|
libsystemd_static],
|
||||||
dependencies : libshared_deps,
|
dependencies : [libshared_deps,
|
||||||
|
userspace],
|
||||||
install : true,
|
install : true,
|
||||||
install_dir : rootpkglibdir)
|
install_dir : rootpkglibdir)
|
||||||
|
|
||||||
|
@ -323,7 +325,8 @@ if get_option('fdisk') != 'false'
|
||||||
'shared-fdisk',
|
'shared-fdisk',
|
||||||
shared_fdisk_sources,
|
shared_fdisk_sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : [libfdisk],
|
dependencies : [libfdisk,
|
||||||
|
userspace],
|
||||||
c_args : ['-fvisibility=default'],
|
c_args : ['-fvisibility=default'],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -29,6 +29,7 @@ libtimesyncd_core = static_library(
|
||||||
'timesyncd-core',
|
'timesyncd-core',
|
||||||
sources,
|
sources,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
|
dependencies : userspace,
|
||||||
link_with : timesyncd_link_with,
|
link_with : timesyncd_link_with,
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
|
|
|
@ -108,7 +108,8 @@ libudevd_core = static_library(
|
||||||
include_directories : udev_includes,
|
include_directories : udev_includes,
|
||||||
link_with : udev_link_with,
|
link_with : udev_link_with,
|
||||||
dependencies : [libblkid,
|
dependencies : [libblkid,
|
||||||
libkmod],
|
libkmod,
|
||||||
|
userspace],
|
||||||
build_by_default : false)
|
build_by_default : false)
|
||||||
|
|
||||||
udev_progs = [['ata_id/ata_id.c'],
|
udev_progs = [['ata_id/ata_id.c'],
|
||||||
|
@ -134,7 +135,8 @@ foreach prog : udev_progs
|
||||||
name,
|
name,
|
||||||
prog,
|
prog,
|
||||||
include_directories : includes,
|
include_directories : includes,
|
||||||
dependencies : versiondep,
|
dependencies : [userspace,
|
||||||
|
versiondep],
|
||||||
link_with : udev_link_with,
|
link_with : udev_link_with,
|
||||||
install_rpath : udev_rpath,
|
install_rpath : udev_rpath,
|
||||||
install : true,
|
install : true,
|
||||||
|
|
Loading…
Reference in a new issue