diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-06 21:47:17 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-03-20 23:40:35 +0100 |
| commit | 6619c67a74e788e39cc6ee3ccb4b20562afde986 (patch) | |
| tree | 1d24c41af40a1b4838dcd4d9e098989cb13f7fdb | |
| parent | 42735cb9b9ca8290ee0566b4e1dce9d5ca2ed036 (diff) | |
| download | buildroot-6619c67a74e788e39cc6ee3ccb4b20562afde986.tar.gz buildroot-6619c67a74e788e39cc6ee3ccb4b20562afde986.zip | |
cairo, icu, webkitgtk24: use BR2_TOOLCHAIN_HAS_LIBATOMIC
This commit modifies the cairo, icu and webkitgtk24 packages to use
BR2_TOOLCHAIN_HAS_LIBATOMIC when appropriate.
Fixes:
http://autobuild.buildroot.net/results/ec4/ec4e48c0e4b8fa72d8bb7ef4ad67a166699c0b62/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/cairo/cairo.mk | 2 | ||||
| -rw-r--r-- | package/icu/icu.mk | 2 | ||||
| -rw-r--r-- | package/webkitgtk24/webkitgtk24.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 6b54b286e1..b6ab54eaa0 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -18,7 +18,7 @@ endif # cairo can use C++11 atomics when available, so we need to link with # libatomic for the architectures who need libatomic. -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) CAIRO_CONF_ENV += LIBS="-latomic" endif diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 68ea1ff7c4..40fe4b8346 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -21,7 +21,7 @@ ICU_CONF_OPTS = \ # When available, icu prefers to use C++11 atomics, which rely on the # __atomic builtins. On certain architectures, this requires linking # with libatomic starting from gcc 4.8. -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) ICU_CONF_ENV += LIBS="-latomic" endif diff --git a/package/webkitgtk24/webkitgtk24.mk b/package/webkitgtk24/webkitgtk24.mk index 2803d44183..4b7d6949d4 100644 --- a/package/webkitgtk24/webkitgtk24.mk +++ b/package/webkitgtk24/webkitgtk24.mk @@ -29,7 +29,7 @@ endif WEBKITGTK24_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config # Some 32-bit architectures need libatomic support for 64-bit ops -ifeq ($(BR2_i386)$(BR2_mips)$(BR2_mipsel)$(BR2_sh),y) +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) WEBKITGTK24_CONF_ENV += LIBS="-latomic" endif |
