diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libunwind/libunwind.inc | 2 | ||||
-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" | |||
2 | DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" | 2 | DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" |
3 | HOMEPAGE = "http://www.nongnu.org/libunwind" | 3 | HOMEPAGE = "http://www.nongnu.org/libunwind" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" | 5 | LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" |
6 | DEPENDS += "libatomic-ops" | 6 | DEPENDS += "libatomic-ops" |
7 | 7 | ||
8 | inherit autotools | 8 | inherit 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 @@ | |||
1 | require libunwind.inc | 1 | require libunwind.inc |
2 | 2 | ||
3 | PV = "1.1+git${SRCPV}" | 3 | SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f" |
4 | SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992" | ||
4 | 5 | ||
5 | SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" | 6 | SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ |
6 | |||
7 | SRC_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" | |||
25 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | 24 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" |
26 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | 25 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" |
27 | 26 | ||
28 | S = "${WORKDIR}/git" | ||
29 | |||
30 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | 27 | LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |