From c3ee9b23c9ee3515ada919faf6ac2446d168f714 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Wed, 17 Apr 2024 11:11:21 -0500 Subject: [PATCH] meson: Add missing check for build-ipcrm option The build-ipcrm option exists in meson_options.txt but has no effect. Use the option to gate building the ipcrm executable. Signed-off-by: Jordan Williams (cherry picked from commit 25c9b3b4d849f6211ccb668932f0f8823286cd7d) --- meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 24dbe7514..1b682e51f 100644 --- a/meson.build +++ b/meson.build @@ -1387,16 +1387,20 @@ exes += exe manadocs += ['sys-utils/ipcmk.1.adoc'] bashcompletions += ['ipcmk'] +opt = get_option('build-ipcrm').allowed() exe = executable( 'ipcrm', ipcrm_sources, include_directories : includes, link_with : [lib_common], install_dir : usrbin_exec_dir, - install : true) -exes += exe -manadocs += ['sys-utils/ipcrm.1.adoc'] -bashcompletions += ['ipcrm'] + install : opt, + build_by_default : opt) +if opt and not is_disabler(exe) + exes += exe + manadocs += ['sys-utils/ipcrm.1.adoc'] + bashcompletions += ['ipcrm'] +endif opt = not get_option('build-ipcs').disabled() exe = executable( -- 2.47.3