From fd55e8a463f42e4012aeedacb2d168f41232bf25 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 21 Apr 2017 15:39:59 +0300 Subject: libunwind: update to 1.2 Switch to using tarballs as git is unreliable (not responding right now). LICENSE file is gone; COPYING has an additional line on top with copyright attribution, the license text that follows has not changed. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-support/libunwind/libunwind.inc | 2 +- meta/recipes-support/libunwind/libunwind_1.2.bb | 27 ++++++++++++++++++++++ meta/recipes-support/libunwind/libunwind_git.bb | 30 ------------------------- 3 files changed, 28 insertions(+), 31 deletions(-) create mode 100644 meta/recipes-support/libunwind/libunwind_1.2.bb delete mode 100644 meta/recipes-support/libunwind/libunwind_git.bb (limited to 'meta/recipes-support/libunwind') 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" DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" HOMEPAGE = "http://www.nongnu.org/libunwind" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" +LIC_FILES_CHKSUM = "file://COPYING;beginline=3;md5=3fced11d6df719b47505837a51c16ae5" DEPENDS += "libatomic-ops" inherit autotools diff --git a/meta/recipes-support/libunwind/libunwind_1.2.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb new file mode 100644 index 0000000000..a398d332e2 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind_1.2.bb @@ -0,0 +1,27 @@ +require libunwind.inc + +SRC_URI[md5sum] = "eefcb5d7f78fdc8f1ed172a26ea4202f" +SRC_URI[sha256sum] = "1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992" + +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ + file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ + file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ + file://0001-x86-Stub-out-x86_local_resume.patch \ + file://0001-Fix-build-on-mips-musl.patch \ + file://0001-add-knobs-to-disable-enable-tests.patch \ + file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ + file://libunwind-1.1-x32.patch \ + " + +SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" +EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests " + +# http://errors.yoctoproject.org/Errors/Details/20487/ +ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET_armv5 = "arm" + +# see https://sourceware.org/bugzilla/show_bug.cgi?id=19987 +SECURITY_CFLAGS_remove_aarch64 = "-fpie" +SECURITY_CFLAGS_append_aarch64 = " -fPIE" + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" diff --git a/meta/recipes-support/libunwind/libunwind_git.bb b/meta/recipes-support/libunwind/libunwind_git.bb deleted file mode 100644 index b637c5c448..0000000000 --- a/meta/recipes-support/libunwind/libunwind_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -require libunwind.inc - -PV = "1.1+git${SRCPV}" - -SRCREV = "bc8698fd7ed13a629a8ec3cb2a89bd74f9d8b5c0" - -SRC_URI = "git://git.sv.gnu.org/libunwind.git \ - file://Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ - file://0001-backtrace-Use-only-with-glibc-and-uclibc.patch \ - file://0001-x86-Stub-out-x86_local_resume.patch \ - file://0001-Fix-build-on-mips-musl.patch \ - file://0001-add-knobs-to-disable-enable-tests.patch \ - file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ - file://libunwind-1.1-x32.patch \ - " - -SRC_URI_append_libc-musl = " file://musl-header-conflict.patch" -EXTRA_OECONF_append_libc-musl = " --disable-documentation --disable-tests " - -# http://errors.yoctoproject.org/Errors/Details/20487/ -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" - -# see https://sourceware.org/bugzilla/show_bug.cgi?id=19987 -SECURITY_CFLAGS_remove_aarch64 = "-fpie" -SECURITY_CFLAGS_append_aarch64 = " -fPIE" - -S = "${WORKDIR}/git" - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -- cgit 1.2.3-korg