summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2021-09-12 15:02:51 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-09-19 20:48:57 +0300
commitc52e8429cce91dadf98378d87015d8f476a44f70 (patch)
tree7de0da7df2e942f0edd354db3a9684da6feaec73
parent556e2de509cf561c5584d77e731f776c5b357737 (diff)
libcamera: base: Add libatomic dependency
Add libatomic dependency which is needed since the addition of the base support library in commit 27aff949fbc1 ("libcamera/base: Move extended base functionality") to avoid the following build failure: /tmp/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/libcamera/base/libcamera-base.so.p/message.cpp.o: in function `libcamera::Message::registerMessageType()': message.cpp:(.text+0x290): undefined reference to `__atomic_fetch_add_4' Fixes: 27aff949fbc1 ("libcamera/base: Move extended base functionality") Fixes: http://autobuild.buildroot.org/results/6e3471df8e9312a1789ca05ae70cc2283bfeec23 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/base/meson.build1
-rw-r--r--src/libcamera/meson.build3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build
index d799c66d..8e125744 100644
--- a/src/libcamera/base/meson.build
+++ b/src/libcamera/base/meson.build
@@ -20,6 +20,7 @@ libcamera_base_sources = files([
libcamera_base_deps = [
dependency('threads'),
+ libatomic,
]
# Internal components must use the libcamera_base_private dependency to enable
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index e9230b98..bf82d38b 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -54,12 +54,13 @@ includes = [
libcamera_includes,
]
+libatomic = cc.find_library('atomic', required : false)
+
subdir('base')
subdir('ipa')
subdir('pipeline')
subdir('proxy')
-libatomic = cc.find_library('atomic', required : false)
libdl = cc.find_library('dl')
libgnutls = cc.find_library('gnutls', required : true)
libudev = dependency('libudev', required : false)