shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-25 21:57:32 +03:00
Code

meson: Introduce userspace dep

Browse Source 
This will help in a later commit to separate userspace from EFI builds.
This commit is contained in:
Jan Janssen 2023-02-26 11:07:24 +01:00
parent f69edd6faf
commit 9214828313
18 changed files with 375 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

475
meson.build
View File

File diff suppressed because it is too large Load Diff

15
src/basic/meson.build
View File

@ -262,10 +262,11 @@ libbasic = static_library(
basic_sources,
fundamental_sources,
include_directories : basic_includes,
dependencies : [versiondep,
dependencies : [libcap,
libm,
threads,
libcap,
libm],
userspace,
versiondep],
c_args : ['-fvisibility=default'],
build_by_default : false)
@ -281,7 +282,8 @@ libbasic_gcrypt = static_library(
'basic-gcrypt',
basic_gcrypt_sources,
include_directories : basic_includes,
dependencies : [libgcrypt],
dependencies : [libgcrypt,
userspace],
c_args : ['-fvisibility=default'],
build_by_default : false)
@ -297,8 +299,9 @@ libbasic_compress = static_library(
'basic-compress',
basic_compress_sources,
include_directories : basic_includes,
dependencies : [libxz,
dependencies : [liblz4,
libxz,
libzstd,
liblz4],
userspace],
c_args : ['-fvisibility=default'],
build_by_default : false)

19
src/core/meson.build
View File

@ -120,19 +120,20 @@ libcore = shared_library(
link_args : ['-shared',
'-Wl,--version-script=' + libshared_sym_path],
link_with : libshared,
dependencies : [versiondep,
threads,
dependencies : [libacl,
libapparmor,
libaudit,
libblkid,
libdl,
libkmod,
libmount,
libpam,
librt,
libseccomp,
libpam,
libaudit,
libkmod,
libapparmor,
libselinux,
libmount,
libblkid,
libacl],
threads,
userspace,
versiondep],
install : true,
install_dir : rootpkglibdir)

1
src/cryptsetup/cryptsetup-tokens/meson.build
View File

@ -7,6 +7,7 @@ lib_cryptsetup_token_common = static_library(
'cryptsetup-token-common',
'cryptsetup-token-util.c',
include_directories : includes,
dependencies : userspace,
link_with : libshared,
build_by_default : false)

3
src/import/meson.build
View File

@ -36,7 +36,8 @@ if conf.get('ENABLE_IMPORTD') == 1
include_directories : includes,
dependencies : [libbzip2,
libxz,
libz],
libz,
userspace],
build_by_default : false)
install_data('org.freedesktop.import1.conf',

7
src/journal-remote/meson.build
View File

@ -22,11 +22,12 @@ libsystemd_journal_remote = static_library(
libsystemd_journal_remote_sources,
include_directories : journal_includes,
link_with : libjournal_core,
dependencies : [threads,
dependencies : [libgnutls,
liblz4,
libmicrohttpd,
libgnutls,
libxz,
liblz4],
threads,
userspace],
build_by_default : false)
systemd_journal_remote_sources = files('journal-remote-main.c')

3
src/journal/meson.build
View File

@ -25,7 +25,8 @@ libjournal_core = static_library(
'journal-core',
sources,
include_directories : includes,
dependencies: threads,
dependencies: [threads,
userspace],
build_by_default : false)
journal_includes = [includes, include_directories('.')]

1
src/libsystemd-network/meson.build
View File

@ -32,6 +32,7 @@ libsystemd_network = static_library(
'systemd-network',
sources,
include_directories : includes,
dependencies : userspace,
build_by_default : false)
libsystemd_network_includes = [includes, include_directories('.')]

3
src/libsystemd/meson.build
View File

@ -122,7 +122,8 @@ libsystemd_static = static_library(
link_with : [libbasic,
libbasic_compress],
dependencies : [threads,
librt],
librt,
userspace],
build_by_default : false)
libsystemd_sym = files('libsystemd.sym')

1
src/libudev/meson.build
View File

@ -25,6 +25,7 @@ libudev_basic = static_library(
'udev-basic',
libudev_sources,
include_directories : includes,
dependencies : userspace,
c_args : ['-fvisibility=default'],
build_by_default : false)

3
src/login/meson.build
View File

@ -35,7 +35,8 @@ liblogind_core = static_library(
'logind-core',
liblogind_core_sources,
include_directories : includes,
dependencies : libacl,
dependencies : [libacl,
userspace],
build_by_default : false)
loginctl_sources = files(

3
src/machine/meson.build
View File

@ -18,7 +18,8 @@ libmachine_core = static_library(
'machine-core',
libmachine_core_sources,
include_directories : includes,
dependencies : threads,
dependencies : [threads,
userspace],
build_by_default : false)
if conf.get('ENABLE_MACHINED') == 1

1
src/network/meson.build
View File

@ -146,6 +146,7 @@ libnetworkd_core = static_library(
'networkd-core',
sources,
include_directories : network_includes,
dependencies : userspace,
link_with : networkd_link_with,
build_by_default : false)

3
src/nspawn/meson.build
View File

@ -31,7 +31,8 @@ libnspawn_core = static_library(
include_directories : includes,
dependencies : [libacl,
libseccomp,
libselinux],
libselinux,
userspace],
build_by_default : false)
systemd_nspawn_sources = files('nspawn.c')

1
src/resolve/meson.build
View File

@ -85,6 +85,7 @@ libsystemd_resolve_core = static_library(
'systemd-resolve-core',
basic_dns_sources,
include_directories : includes,
dependencies : userspace,
build_by_default : false)
systemd_resolved_sources += custom_target(

9
src/shared/meson.build
View File

@ -296,7 +296,8 @@ libshared_static = static_library(
libshared_name,
shared_sources,
include_directories : includes,
dependencies : libshared_deps,
dependencies : [libshared_deps,
userspace],
c_args : ['-fvisibility=default'],
build_by_default : false)
@ -310,7 +311,8 @@ libshared = shared_library(
libbasic,
libbasic_gcrypt,
libsystemd_static],
dependencies : libshared_deps,
dependencies : [libshared_deps,
userspace],
install : true,
install_dir : rootpkglibdir)
@ -323,7 +325,8 @@ if get_option('fdisk') != 'false'
'shared-fdisk',
shared_fdisk_sources,
include_directories : includes,
dependencies : [libfdisk],
dependencies : [libfdisk,
userspace],
c_args : ['-fvisibility=default'],
build_by_default : false)
endif

1
src/timesync/meson.build
View File

@ -29,6 +29,7 @@ libtimesyncd_core = static_library(
'timesyncd-core',
sources,
include_directories : includes,
dependencies : userspace,
link_with : timesyncd_link_with,
build_by_default : false)

6
src/udev/meson.build
View File

@ -108,7 +108,8 @@ libudevd_core = static_library(
include_directories : udev_includes,
link_with : udev_link_with,
dependencies : [libblkid,
libkmod],
libkmod,
userspace],
build_by_default : false)
udev_progs = [['ata_id/ata_id.c'],
@ -134,7 +135,8 @@ foreach prog : udev_progs
name,
prog,
include_directories : includes,
dependencies : versiondep,
dependencies : [userspace,
versiondep],
link_with : udev_link_with,
install_rpath : udev_rpath,
install : true,