summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2018-07-10 20:27:40 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-07-16 16:29:09 +0200
commit0fbc50d46a52555b7fc199ba319d011c0c7fd1c8 (patch)
tree06738716730dfacad0b33cbbe00c7123dd398aea
parent9919549ad0d8a2428450d55fe8c5e9cd4c569456 (diff)
downloadbuildroot-0fbc50d46a52555b7fc199ba319d011c0c7fd1c8.tar.gz
buildroot-0fbc50d46a52555b7fc199ba319d011c0c7fd1c8.zip
wampcc: needs atomic
Fixes: - http://autobuild.buildroot.net/results/2f994762d4e01a904c50cf2728a4103e6e79da2a Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/wampcc/Config.in3
-rw-r--r--package/wampcc/wampcc.mk5
2 files changed, 8 insertions, 0 deletions
diff --git a/package/wampcc/Config.in b/package/wampcc/Config.in
index 9cf7d99dfe..92abc9cb25 100644
--- a/package/wampcc/Config.in
+++ b/package/wampcc/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_WAMPCC
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
depends on BR2_USE_MMU # libuv
depends on !BR2_STATIC_LIBS # libuv
+ depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future
select BR2_PACKAGE_LIBUV
@@ -17,11 +18,13 @@ config BR2_PACKAGE_WAMPCC
comment "wampcc needs a toolchain w/ C++, NPTL, dynamic library"
depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
comment "wampcc needs a toolchain not affected by GCC bug 64735"
depends on BR2_USE_MMU
+ depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/package/wampcc/wampcc.mk b/package/wampcc/wampcc.mk
index d8e093f679..dcd65f49d5 100644
--- a/package/wampcc/wampcc.mk
+++ b/package/wampcc/wampcc.mk
@@ -11,4 +11,9 @@ WAMPCC_INSTALL_STAGING = YES
WAMPCC_LICENSE = MIT
WAMPCC_LICENSE_FILES = LICENSE
+# Uses __atomic_fetch_add_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+WAMPCC_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
+endif
+
$(eval $(cmake-package))
OpenPOWER on IntegriCloud