mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-27 15:33:28 +08:00
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>
This commit is contained in:
parent
42735cb9b9
commit
6619c67a74
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user