Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
meson: Add print_wiki option

Align meson options to be equivalent to the Makefile as they are used in
Gentoo's ebuilds.

Signed-off-by: Daniel Campello <campello@chromium.org>
Change-Id: I97d2fd687aa21533b86f9af446038bfe3da1f7d3
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51552
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M meson.build
M meson_options.txt
2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/meson.build b/meson.build
index 43b0fe4..b7e8c10 100644
--- a/meson.build
+++ b/meson.build
@@ -68,6 +68,7 @@
config_stlinkv3_spi = get_option('config_stlinkv3_spi')
config_lspcon_i2c_spi = get_option('config_lspcon_i2c_spi')
config_realtek_mst_i2c_spi = get_option('config_realtek_mst_i2c_spi')
+config_print_wiki= get_option('print_wiki')

cargs = []
deps = []
@@ -429,6 +430,11 @@
dependencies : deps
)

+if config_print_wiki
+ srcs += 'print_wiki.c'
+ cargs += '-DCONFIG_PRINT_WIKI=1'
+endif
+
# we can't just link_with libflashrom as we require all the internal symbols...
executable(
'flashrom',
diff --git a/meson_options.txt b/meson_options.txt
index b599d66..cd92f10 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('print_wiki', type : 'boolean', value : true, description : 'Print Wiki')

option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')

To view, visit change 51552. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I97d2fd687aa21533b86f9af446038bfe3da1f7d3
Gerrit-Change-Number: 51552
Gerrit-PatchSet: 4
Gerrit-Owner: Daniel Campello <campello@chromium.org>
Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Mario Limonciello <superm1@gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth@google.com>
Gerrit-Reviewer: Richard Hughes <hughsient@gmail.com>
Gerrit-Reviewer: Richard Hughes <richard@hughsie.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged