Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/54368 )
Change subject: meson.build: Fix cmocka to be optional at configure-time ......................................................................
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 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 quasisec@google.com --- M meson.build 1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/54368/1
diff --git a/meson.build b/meson.build index 368820c..81d63a9 100644 --- a/meson.build +++ b/meson.build @@ -462,7 +462,8 @@ # 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 @@ ], )
-subdir('tests') +if cmocka_dep.found() + subdir('tests') +endif