[libcamera-devel,v4,5/6] cam: Link against libatomic if needed

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

Commit Message

Laurent Pinchart March 8, 2020, 12:04 a.m. UTC
The cam application makes use if std::atomic<>, link against libatomic
if needed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
Changes since v3:

- Use the libatomic dependency object
---
 src/cam/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

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

Thanks for your work.

On 2020-03-08 02:04:32 +0200, Laurent Pinchart wrote:
> The cam application makes use if std::atomic<>, link against libatomic
> if needed.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

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

> ---
> Changes since v3:
> 
> - Use the libatomic dependency object
> ---
>  src/cam/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/cam/meson.build b/src/cam/meson.build
> index 478346c59590..2419d648bc17 100644
> --- a/src/cam/meson.build
> +++ b/src/cam/meson.build
> @@ -7,5 +7,5 @@ cam_sources = files([
>  ])
>  
>  cam  = executable('cam', cam_sources,
> -                  dependencies : libcamera_dep,
> +                  dependencies : [ libatomic, libcamera_dep ],
>                    install : true)
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/cam/meson.build b/src/cam/meson.build
index 478346c59590..2419d648bc17 100644
--- a/src/cam/meson.build
+++ b/src/cam/meson.build
@@ -7,5 +7,5 @@  cam_sources = files([
 ])
 
 cam  = executable('cam', cam_sources,
-                  dependencies : libcamera_dep,
+                  dependencies : [ libatomic, libcamera_dep ],
                   install : true)