summaryrefslogtreecommitdiffstats
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:35:59 +0100
commit3ffad2d4cb06ea141bd51ef36b96d33eeb6f9411 (patch)
tree379060ec4094dc40ec7cb305405049f36bf9c1d0
parenta753bc70d5ee36eff00c08b35136d514a8305ec7 (diff)
downloadpoky-3ffad2d4cb06ea141bd51ef36b96d33eeb6f9411.tar.gz
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) (From OE-Core rev: e43a47eb695050d04809ff54af14066acba6ec27) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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
2HOMEPAGE = "http://www.nongnu.org/libunwind" 2HOMEPAGE = "http://www.nongnu.org/libunwind"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5"
5DEPENDS += "libatomics-ops"
5 6
6SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" 7SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz"
7 8
@@ -18,11 +19,6 @@ ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1"
18ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1" 19ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1"
19ATOMICOPS ?= "" 20ATOMICOPS ?= ""
20 21
21LDFLAGS += "${LIBATOMICS}"
22LIBATOMICS_armv5 = "-latomic_ops"
23LIBATOMICS_armv4 = "-latomic_ops"
24LIBATOMICS ?= ""
25
26LDFLAGS_append_x86 = " -fuse-ld=gold" 22LDFLAGS_append_x86 = " -fuse-ld=gold"
27LDFLAGS_append_x86-64 = " -fuse-ld=gold" 23LDFLAGS_append_x86-64 = " -fuse-ld=gold"
28 24
@@ -32,9 +28,4 @@ LDFLAGS_append_aarch64 = " -fuse-ld=gold"
32LDFLAGS_append_powerpc = " -fuse-ld=gold" 28LDFLAGS_append_powerpc = " -fuse-ld=gold"
33LDFLAGS_append_powerpc64 = " -fuse-ld=gold" 29LDFLAGS_append_powerpc64 = " -fuse-ld=gold"
34 30
35DEPENDS += "${DEPLIBATOMICS}"
36DEPLIBATOMICS_armv5 = "libatomics-ops"
37DEPLIBATOMICS_armv4 = "libatomics-ops"
38DEPLIBATOMICS ?= ""
39
40BBCLASSEXTEND = "native" 31BBCLASSEXTEND = "native"