[libcamera-devel,v4,4/6] libcamera: meson: Make libatomic and libdl dependencies reusable

Message ID 20200308000433.2917-5-laurent.pinchart@ideasonboard.com
State Accepted
Commit 61aa357a95dcb52537fba85fab58038ae9d6a97a
Headers show
Series
  • Fix race condition and other build issues
Related show

Commit Message

Laurent Pinchart March 8, 2020, 12:04 a.m. UTC
libcamera.so links against libatomic and libdl, and handles those
dependencies directly in the shared_object() call. More components
within libcamera will need those dependencies, extract them to named
variables to make them reusable.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Niklas Söderlund March 8, 2020, 5:32 p.m. UTC | #1
Hi Laurent,

Thanks for your work.

On 2020-03-08 02:04:31 +0200, Laurent Pinchart wrote:
> libcamera.so links against libatomic and libdl, and handles those
> dependencies directly in the shared_object() call. More components
> within libcamera will need those dependencies, extract them to named
> variables to make them reusable.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/libcamera/meson.build | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index 1b69bc0dee54..87fa09cde63d 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -58,6 +58,8 @@ includes = [
>  subdir('pipeline')
>  subdir('proxy')
>  
> +libatomic = cc.find_library('atomic', required : false)
> +libdl = cc.find_library('dl')
>  libudev = dependency('libudev', required : false)
>  
>  if libudev.found()
> @@ -93,8 +95,8 @@ version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
>  libcamera_sources += version_cpp
>  
>  libcamera_deps = [
> -    cc.find_library('atomic', required: false),
> -    cc.find_library('dl'),
> +    libatomic,
> +    libdl,
>      libudev,
>      dependency('threads'),
>  ]
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 1b69bc0dee54..87fa09cde63d 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -58,6 +58,8 @@  includes = [
 subdir('pipeline')
 subdir('proxy')
 
+libatomic = cc.find_library('atomic', required : false)
+libdl = cc.find_library('dl')
 libudev = dependency('libudev', required : false)
 
 if libudev.found()
@@ -93,8 +95,8 @@  version_cpp = vcs_tag(command : [gen_version, meson.build_root()],
 libcamera_sources += version_cpp
 
 libcamera_deps = [
-    cc.find_library('atomic', required: false),
-    cc.find_library('dl'),
+    libatomic,
+    libdl,
     libudev,
     dependency('threads'),
 ]