From 5d73db9e497cccc72f24e60d578dac3939e28934 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Dec 2021 14:07:03 +0100 Subject: libunwind: update 1.6.0 -> 1.6.2 (From OE-Core rev: ad0ec1ccd87e51e5f4f7ab9bb821a486ef5c2374) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libunwind/libunwind/musl-header-conflict.patch | 4 ++-- meta/recipes-support/libunwind/libunwind_1.6.0.bb | 24 ---------------------- meta/recipes-support/libunwind/libunwind_1.6.2.bb | 24 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 meta/recipes-support/libunwind/libunwind_1.6.0.bb create mode 100644 meta/recipes-support/libunwind/libunwind_1.6.2.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch index 63b78a8a30..49985b5b3c 100644 --- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +++ b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch @@ -1,4 +1,4 @@ -From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001 +From e1de5a5b42062dc02769f320c7785928b2ee0c57 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Aug 2016 14:46:32 +0100 Subject: [PATCH] If you: @@ -28,7 +28,7 @@ Upstream-Status: Inappropriate [really need to fix gcc] 1 file changed, 4 insertions(+) diff --git a/include/unwind.h b/include/unwind.h -index 7cf128d..31c2871 100644 +index 93780fa..c812414 100644 --- a/include/unwind.h +++ b/include/unwind.h @@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION diff --git a/meta/recipes-support/libunwind/libunwind_1.6.0.bb b/meta/recipes-support/libunwind/libunwind_1.6.0.bb deleted file mode 100644 index 91189fdb71..0000000000 --- a/meta/recipes-support/libunwind/libunwind_1.6.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -require libunwind.inc - -SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ - file://0003-x86-Stub-out-x86_local_resume.patch \ - file://0004-Fix-build-on-mips-musl.patch \ - file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ - file://0006-Fix-for-X32.patch \ - " -SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" - -SRC_URI[sha256sum] = "7194c20dda841b26917c0579e6467b53f7ad2e3f9452e5c77f3c3829c4656b70" - -EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" - -# http://errors.yoctoproject.org/Errors/Details/20487/ -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" - -COMPATIBLE_HOST:riscv32 = "null" - -LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" -CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb new file mode 100644 index 0000000000..716be9a452 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb @@ -0,0 +1,24 @@ +require libunwind.inc + +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ + file://0003-x86-Stub-out-x86_local_resume.patch \ + file://0004-Fix-build-on-mips-musl.patch \ + file://0005-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ + file://0006-Fix-for-X32.patch \ + " +SRC_URI:append:libc-musl = " file://musl-header-conflict.patch" + +SRC_URI[sha256sum] = "4a6aec666991fb45d0889c44aede8ad6eb108071c3554fcdff671f9c94794976" + +EXTRA_OECONF:append:libc-musl = " --disable-documentation --disable-tests --enable-static" + +# http://errors.yoctoproject.org/Errors/Details/20487/ +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" + +COMPATIBLE_HOST:riscv32 = "null" + +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" + +SECURITY_LDFLAGS:append:libc-musl = " -lssp_nonshared" +CACHED_CONFIGUREVARS:append:libc-musl = " LDFLAGS='${LDFLAGS} -lucontext'" -- cgit v1.2.3-54-g00ecf