meson: Introduce userspace dep

This will help in a later commit to separate userspace from EFI builds.

17 files changed, 51 insertions, 29 deletions

diff --git a/src/basic/meson.build b/src/basic/meson.build
index b9da0544c2..2a26a6e508 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -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)
diff --git a/src/core/meson.build b/src/core/meson.build
index 15df4485ca..e68c55917f 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -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)
 
diff --git a/src/cryptsetup/cryptsetup-tokens/meson.build b/src/cryptsetup/cryptsetup-tokens/meson.build
index 9df3fea5d7..e7b7fbab11 100644
--- a/src/cryptsetup/cryptsetup-tokens/meson.build
+++ b/src/cryptsetup/cryptsetup-tokens/meson.build
@@ -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)
 
diff --git a/src/import/meson.build b/src/import/meson.build
index 58b9719cc1..ffebeebacd 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -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',
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 74f01b0476..9fe1b8049b 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -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')
diff --git a/src/journal/meson.build b/src/journal/meson.build
index c9ff54c991..1490113f1c 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -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('.')]
diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 85d4afeb05..ac4a15b474 100644
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -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('.')]
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 23fa7c20ca..91887be831 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -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')
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 0e53b83e51..1c349cef6d 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -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)
 
diff --git a/src/login/meson.build b/src/login/meson.build
index 198023715b..473cf34089 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -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(
diff --git a/src/machine/meson.build b/src/machine/meson.build
index 7b09d4b24f..d8b2dd188d 100644
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -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
diff --git a/src/network/meson.build b/src/network/meson.build
index 91572ba132..dab77a0d22 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -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)
 
diff --git a/src/nspawn/meson.build b/src/nspawn/meson.build
index 43e3e188b2..9f00e88256 100644
--- a/src/nspawn/meson.build
+++ b/src/nspawn/meson.build
@@ -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')
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 8166118c74..052d54086f 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -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(
diff --git a/src/shared/meson.build b/src/shared/meson.build
index 82fd206d69..5234b3f7c6 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -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
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index f847728f62..54f5b18a3a 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -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)
 
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 1cac581e7f..af7dea0dce 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -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,