[S] Change in flashrom[master]: meson: Build the classic cli / flashrom cli executable as feature

[Thomas Heijligen (Code Review)]

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66705 )

Change subject: meson: Build the classic cli / flashrom cli executable as feature
......................................................................

meson: Build the classic cli / flashrom cli executable as feature

Provide the meson option `-Dclassic_cli=auto/enabled/disabled` to
determine if the classic cli flashrom executable should be built. This
is needed to support targets, like libpayload, which can only build
libflashrom.

Change-Id: If39981ad0b3281edd6fc7e220362d2938dddf814
Signed-off-by: Thomas Heijligen 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66705
Reviewed-by: Anastasia Klimchuk 
Reviewed-by: Felix Singer 
Tested-by: build bot (Jenkins) 
---
M meson.build
M meson_options.txt
2 files changed, 35 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/meson.build b/meson.build
index 366ce18..634e627 100644
--- a/meson.build
+++ b/meson.build
@@ -478,19 +478,21 @@
   install_dir: join_paths(get_option('mandir'), 'man8'),
 )

-executable(
-  'flashrom',
-  files(
-    'cli_classic.c',
-    'cli_common.c',
-    'cli_output.c',
-  ),
-  c_args : cargs,
-  include_directories : include_dir,
-  install : true,
-  install_dir : get_option('sbindir'),
-  link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom
-)
+if get_option('classic_cli').auto() or get_option('classic_cli').enabled()
+  executable(
+    'flashrom',
+    files(
+      'cli_classic.c',
+      'cli_common.c',
+      'cli_output.c',
+    ),
+    c_args : cargs,
+    include_directories : include_dir,
+    install : true,
+    install_dir : get_option('sbindir'),
+    link_with : libflashrom.get_static_lib(), # flashrom needs internal symbols of libflashrom
+  )
+endif

if get_option('ich_descriptors_tool').auto() or get_option('ich_descriptors_tool').enabled()
   subdir('util/ich_descriptors_tool')
diff --git a/meson_options.txt b/meson_options.txt
index 284bfba..850505d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,6 @@
 option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
 option('usb', type : 'boolean', value : true, description : 'use libusb1')
+option('classic_cli', type : 'feature', value : 'enabled', description : 'classic flashrom cli binary')
 option('print_wiki', type : 'boolean', value : true,  description : 'Print Wiki')
 option('default_programmer_name', type : 'string', description : 'default programmer')
 option('default_programmer_args', type : 'string', description : 'default programmer arguments')