mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-29 16:03:47 +02:00
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 <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54368 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
11a35980de
commit
16c62a791d
@ -462,7 +462,8 @@ subdir('util')
|
|||||||
# unit-test framework
|
# unit-test framework
|
||||||
cmocka_dep = dependency(
|
cmocka_dep = dependency(
|
||||||
'cmocka',
|
'cmocka',
|
||||||
fallback: ['cmocka', 'cmocka_dep']
|
fallback: ['cmocka', 'cmocka_dep'],
|
||||||
|
required: false
|
||||||
)
|
)
|
||||||
flashrom_test_dep = declare_dependency(
|
flashrom_test_dep = declare_dependency(
|
||||||
include_directories : include_directories('.'),
|
include_directories : include_directories('.'),
|
||||||
@ -481,4 +482,6 @@ flashrom_test_dep = declare_dependency(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('tests')
|
if cmocka_dep.found()
|
||||||
|
subdir('tests')
|
||||||
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user