From: Jordan Williams Date: Mon, 22 Apr 2024 13:46:55 +0000 (-0500) Subject: meson: Add build-blkpr option X-Git-Tag: v2.40.1-rc1~9^2~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6299fd50a6862996930cacfb5aa79f43939fc24e;p=thirdparty%2Futil-linux.git meson: Add build-blkpr option Signed-off-by: Jordan Williams (cherry picked from commit cd8fd8a1e23b39f6cb069a4829cf2ecc497c8e1c) --- diff --git a/meson.build b/meson.build index 8213d3e21..06d42ae6c 100644 --- a/meson.build +++ b/meson.build @@ -1599,14 +1599,16 @@ if cc.has_header('linux/blkzoned.h') bashcompletions += ['blkzone'] endif -if cc.has_header('linux/pr.h') - exe = executable( - 'blkpr', - blkpr_sources, - include_directories : includes, - link_with : [lib_common], - install_dir : sbindir, - install : true) +opt = get_option('build-blkpr').require(cc.has_header('linux/pr.h')).allowed() +exe = executable( + 'blkpr', + blkpr_sources, + include_directories : includes, + link_with : [lib_common], + install_dir : sbindir, + install : opt, + build_by_default : opt) +if opt and not is_disabler(exe) exes += exe manadocs += ['sys-utils/blkpr.8.adoc'] endif diff --git a/meson_options.txt b/meson_options.txt index 500c3bfba..ecd395c3d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -141,6 +141,8 @@ option('build-fstrim', type : 'feature', description : 'build fstrim') option('build-dmesg', type : 'feature', description : 'build dmesg') +option('build-blkpr', type : 'feature', + description : 'build blkpr') option('build-kill', type : 'feature', description : 'build kill') option('build-last', type : 'feature',