[oe-commits] Christopher Larson : libunwind: always depend on libatomics-ops
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 25 09:48:24 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: db4d8dee0c144dfedeefd1768eaf8eba5e9d6bf1
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=db4d8dee0c144dfedeefd1768eaf8eba5e9d6bf1
Author: Christopher Larson <kergoth at gmail.com>
Date: Mon Aug 24 15:19:43 2015 -0700
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.
Signed-off-by: Christopher Larson <kergoth at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-support/libunwind/libunwind.inc | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index 406bbe4..c8eab58 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"
More information about the Openembedded-commits
mailing list