From 16c62a791d0a311bb040812b03c33881ab641a8e Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 17 May 2021 21:10:23 +1000 Subject: meson.build: Fix cmocka to be optional at configure-time While building with meson, however without libcmocka available, attempts are made to fetch a copy to build via the wrap mechanism. However in hermetic build enviroments this causes hard failure as the dependency declaration of cmocka is not optional. Fix this to ensure flashrom can build hermetically in images without libcmocka available. BUG=none BRANCH=none TEST=` $ mkdir build && cd build/ $ meson --wrap-mode=nodownload --wrap-mode=nofallback ../ $ ninja test # validate configs, builds and no tests are run. -- $ sudo apt install libcmocka-dev $ mkdir build && cd build/ $ meson --wrap-mode=nodownload --wrap-mode=nofallback ../ $ ninja test # validate configs, builds and tests are run. ` Change-Id: Ib59f4dacc14be9b02334ca59b348c19e22963367 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/54368 Reviewed-by: Angel Pons Reviewed-by: Anastasia Klimchuk Tested-by: build bot (Jenkins) --- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 368820c6..81d63a9d 100644 --- a/meson.build +++ b/meson.build @@ -462,7 +462,8 @@ subdir('util') # unit-test framework cmocka_dep = dependency( 'cmocka', - fallback: ['cmocka', 'cmocka_dep'] + fallback: ['cmocka', 'cmocka_dep'], + required: false ) flashrom_test_dep = declare_dependency( include_directories : include_directories('.'), @@ -481,4 +482,6 @@ flashrom_test_dep = declare_dependency( ], ) -subdir('tests') +if cmocka_dep.found() + subdir('tests') +endif -- cgit v1.2.3