summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2015-08-24 15:19:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:34:19 +0100
commite43a47eb695050d04809ff54af14066acba6ec27 (patch)
tree315f6a175f31905692764a17234e9ca293186a23 /meta/recipes-support
parent24b80d211f3808a0ffebee426932f11b8d4d46e0 (diff)
downloadopenembedded-core-e43a47eb695050d04809ff54af14066acba6ec27.tar.gz
openembedded-core-e43a47eb695050d04809ff54af14066acba6ec27.tar.bz2
openembedded-core-e43a47eb695050d04809ff54af14066acba6ec27.zip
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 <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libunwind/libunwind.inc11
1 files changed, 1 insertions, 10 deletions
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"