diff mbox series

[v2,1/1] package/opencv3: fix build with atomic

Message ID 20201017134623.3457333-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [v2,1/1] package/opencv3: fix build with atomic | expand

Commit Message

Fabrice Fontaine Oct. 17, 2020, 1:46 p.m. UTC
Restore the atomic workaround that was wrongly removed when bumping to
version 3.4.9 in commit f6fb2cae0691d25b034b12a16261ee26096db7d1 as it
seems that opencv3 still needs help to detect atomic library

Fixes:
 - http://autobuild.buildroot.org/results/9162b29725f8d9b891eb74fcb8078f211140a841

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2 (after review of Yann E. Morin):
 - Restore workaround instead of setting -DHAVE_CXX_ATOMICS_WITHOUT_LIB

 package/opencv3/opencv3.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Yann E. MORIN Oct. 17, 2020, 4:26 p.m. UTC | #1
On 2020-10-17 15:46 +0200, Fabrice Fontaine spake thusly:
> Restore the atomic workaround that was wrongly removed when bumping to
> version 3.4.9 in commit f6fb2cae0691d25b034b12a16261ee26096db7d1 as it
> seems that opencv3 still needs help to detect atomic library
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/9162b29725f8d9b891eb74fcb8078f211140a841
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, after tweaking the commit title to match the other
related commits 'link with libatomic if needed'. Thanks!

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2 (after review of Yann E. Morin):
>  - Restore workaround instead of setting -DHAVE_CXX_ATOMICS_WITHOUT_LIB
> 
>  package/opencv3/opencv3.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
> index de89aebca4..648cc66af3 100644
> --- a/package/opencv3/opencv3.mk
> +++ b/package/opencv3/opencv3.mk
> @@ -13,6 +13,11 @@ OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
>  
>  OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS)
>  
> +# Uses __atomic_fetch_add_4
> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> +OPENCV3_CXXFLAGS += -latomic
> +endif
> +
>  # Fix c++11 build with missing std::exception_ptr
>  ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
>  OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0
> -- 
> 2.28.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard Oct. 29, 2020, 3:04 p.m. UTC | #2
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Restore the atomic workaround that was wrongly removed when bumping to
 > version 3.4.9 in commit f6fb2cae0691d25b034b12a16261ee26096db7d1 as it
 > seems that opencv3 still needs help to detect atomic library

 > Fixes:
 >  - http://autobuild.buildroot.org/results/9162b29725f8d9b891eb74fcb8078f211140a841

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2 (after review of Yann E. Morin):
 >  - Restore workaround instead of setting -DHAVE_CXX_ATOMICS_WITHOUT_LIB

Committed to 2020.02.x and 2020.08.x, thanks.
diff mbox series

Patch

diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index de89aebca4..648cc66af3 100644
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -13,6 +13,11 @@  OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
 
 OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS)
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+OPENCV3_CXXFLAGS += -latomic
+endif
+
 # Fix c++11 build with missing std::exception_ptr
 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
 OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0