mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 22:52:34 +02:00
6c26e9efed
meson's default behavior is to install subprojects, so because we use a wrap to get cmocka if needed and the cmocka wrap sets install=true unless cross-compiling, cmocka headers and libraries will be installed by `meson install`. This isn't useful (because cmocka is used only for tests which don't get installed), and can cause install errors in some configurations. meson can be told to never install subprojects with `meson install --skip-subprojects` which solves this, but is inconvenient because that option must be specified on the command line and there is little hope of meson's default behavior changing [1]. To fix this, I've replaced `patch_url` for the wrap with an included `patch_directory` instead, which was created by unpacking the original archive pointed to by `patch_url` and setting `install : false` in src/meson.build. A more concise option to make the same change would be to make the change to the `install` option in a new patch specified via `diff_files` (which works because patches from `diff_files` are applied after applying the `patch_*` archive), but `diff_files` is not supported by Meson before version 0.63.0 which would require increasing flashrom's minimum meson version from the current 0.56.0. This seems too new, since meson 0.56 was released in October 2020 while meson 0.63 was released in July 2022. [1]: https://github.com/mesonbuild/meson/issues/10561#issuecomment-1444059473 BUG=https://ticket.coreboot.org/issues/561 Change-Id: I15f549175e2d5d52979814d7f7530da868871ce8 Signed-off-by: Peter Marheine <pmarheine@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/84557 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>