mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
meson: Add libmount feature
Let's reduce the dependencies required to build just libsystemd by making libmount optional. The meson disabler feature makes this quite trivial.
This commit is contained in:
@@ -1125,7 +1125,9 @@ else
|
||||
endif
|
||||
|
||||
libmount = dependency('mount',
|
||||
version : fuzzer_build ? '>= 0' : '>= 2.30')
|
||||
version : fuzzer_build ? '>= 0' : '>= 2.30',
|
||||
disabler : true,
|
||||
required : get_option('libmount'))
|
||||
|
||||
libfdisk = dependency('fdisk',
|
||||
version : '>= 2.32',
|
||||
|
||||
@@ -470,6 +470,8 @@ option('dbus', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'd
|
||||
description : 'libdbus support (for tests only)')
|
||||
option('libarchive', type : 'feature',
|
||||
description : 'libarchive support')
|
||||
option('libmount', type : 'feature',
|
||||
description : 'libmount support')
|
||||
|
||||
option('bootloader', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
|
||||
description : 'sd-boot/stub and userspace tools')
|
||||
|
||||
@@ -38,7 +38,7 @@ else
|
||||
# statically linking isn't viable for us for various reasons, we do a build with most features disabled
|
||||
# to link against as few libraries as possible. The libraries we do end up linking against happen (by
|
||||
# chance) to be installed in the oss-fuzz execution environment.
|
||||
meson_args+=("-Doss-fuzz=true" "--auto-features=disabled" "-Dnspawn=enabled" "-Dresolve=true")
|
||||
meson_args+=("-Doss-fuzz=true" "--auto-features=disabled" "-Dlibmount=enabled" "-Dnspawn=enabled" "-Dresolve=true")
|
||||
|
||||
apt-get update
|
||||
apt-get install -y gperf m4 gettext python3-pip \
|
||||
|
||||
Reference in New Issue
Block a user