From e43a47eb695050d04809ff54af14066acba6ec27 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Mon, 24 Aug 2015 15:19:43 -0700 Subject: libunwind: always depend on libatomics-ops - Depend on libatomics-ops unconditionally for all archs, as it's used by more than just arm, and currently the configure script auto-detects and enables its use based on the existence of its header, resulting in non-deterministic builds. - Drop the ldflags bits which link against libatomic_ops, because libunwind doesn't actually link against it, nor does it need to, as it currently uses all inline functions from the header file. (From OE-Core rev: 83bb89502e2f05b8b78b14532ad96abc400ab264) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/recipes-support/libunwind/libunwind.inc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'meta/recipes-support/libunwind') diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc index 406bbe4633..c8eab5882d 100644 --- a/meta/recipes-support/libunwind/libunwind.inc +++ b/meta/recipes-support/libunwind/libunwind.inc @@ -2,6 +2,7 @@ DESCRIPTION = "a portable and efficient C programming interface (API) to determi HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" +DEPENDS += "libatomics-ops" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" @@ -18,11 +19,6 @@ ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1" ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1" ATOMICOPS ?= "" -LDFLAGS += "${LIBATOMICS}" -LIBATOMICS_armv5 = "-latomic_ops" -LIBATOMICS_armv4 = "-latomic_ops" -LIBATOMICS ?= "" - LDFLAGS_append_x86 = " -fuse-ld=gold" LDFLAGS_append_x86-64 = " -fuse-ld=gold" @@ -32,9 +28,4 @@ LDFLAGS_append_aarch64 = " -fuse-ld=gold" LDFLAGS_append_powerpc = " -fuse-ld=gold" LDFLAGS_append_powerpc64 = " -fuse-ld=gold" -DEPENDS += "${DEPLIBATOMICS}" -DEPLIBATOMICS_armv5 = "libatomics-ops" -DEPLIBATOMICS_armv4 = "libatomics-ops" -DEPLIBATOMICS ?= "" - BBCLASSEXTEND = "native" -- cgit 1.2.3-korg