From 10ec09025d6f52f2c1d0ba6b7e6943a603a386d9 Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Wed, 10 Jul 2019 20:29:44 +0900 Subject: libcamera: skip auto version generation when building for Chromium OS Commit b817bcec6b53 ("libcamera: Auto generate version information") causes the build to fail in the Chromium OS build environment, because git update-index tries to take a lock (ie. write) in the git repo that is outside of the build directory. The solution is to simply skip git update-index if we are building in the Chromium OS build environment, and this decision is made if the build directory is not a subdirectory of the source directory. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/libcamera/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libcamera/meson.build') diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 97ff86e2..adc749ec 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -81,7 +81,7 @@ libcamera_sources += control_types_cpp gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh') -version_cpp = vcs_tag(command : [gen_version, meson.source_root()], +version_cpp = vcs_tag(command : [gen_version, meson.build_root()], input : 'version.cpp.in', output : 'version.cpp', fallback : meson.project_version()) -- cgit v1.2.1