summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libunwind/libunwind.inc2
-rw-r--r--meta/recipes-support/libunwind/libunwind_1.2.bb (renamed from meta/recipes-support/libunwind/libunwind_git.bb)9
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-support/libunwind/libunwind.inc b/meta/recipes-support/libunwind/libunwind.inc
index e4ae8df278..4f64ad7f87 100644
--- a/meta/recipes-support/libunwind/libunwind.inc
+++ b/meta/recipes-support/libunwind/libunwind.inc
@@ -2,7 +2,7 @@ SUMMARY = "Library for obtaining the call-chain of a program"
2DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" 2DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program"
3HOMEPAGE = "http://www.nongnu.org/libunwind" 3HOMEPAGE = "http://www.nongnu.org/libunwind"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" 5LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5"
6DEPENDS += "libatomic-ops" 6DEPENDS += "libatomic-ops"
7 7
8inherit autotools 8inherit autotools
diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb
index b637c5c448..a398d332e2 100644
--- a/meta/recipes-support/libunwind/libunwind_git.bb
+++ b/meta/recipes-support/libunwind/libunwind_1.2.bb
@@ -1,10 +1,9 @@
1require libunwind.inc 1require libunwind.inc
2 2
3PV = "1.1+git${SRCPV}" 3SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f"
4SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992"
4 5
5SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" 6SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \
6
7SRC_URI = "git://git.sv.gnu.org/libunwind.git \
8 file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ 7 file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \
9 file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ 8 file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \
10 file://0001-x86-Stub-out-x86_local_resume.patch \ 9 file://0001-x86-Stub-out-x86_local_resume.patch \
@@ -25,6 +24,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25SECURITY_CFLAGS_remove_aarch64 = "-fpie" 24SECURITY_CFLAGS_remove_aarch64 = "-fpie"
26SECURITY_CFLAGS_append_aarch64 = " -fPIE" 25SECURITY_CFLAGS_append_aarch64 = " -fPIE"
27 26
28S = "${WORKDIR}/git"
29
30LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 27LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"