From 494b3c8bf73b8320fc68203d2dff5d5d3f93464e Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 31 May 2020 17:52:29 +0200 Subject: libunwind: upgrade 1.3.1 -> 1.4.0 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../libunwind/libunwind/musl-header-conflict.patch | 27 ++++++++++++++-------- meta/recipes-support/libunwind/libunwind_1.3.1.bb | 24 ------------------- meta/recipes-support/libunwind/libunwind_1.4.0.bb | 24 +++++++++++++++++++ 3 files changed, 41 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-support/libunwind/libunwind_1.3.1.bb create mode 100644 meta/recipes-support/libunwind/libunwind_1.4.0.bb (limited to 'meta/recipes-support/libunwind') diff --git a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch index 79f63fd84e..63b78a8a30 100644 --- a/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch +++ b/meta/recipes-support/libunwind/libunwind/musl-header-conflict.patch @@ -1,4 +1,7 @@ -If you: +From 49b21f0fe5fb93b30b94cc449429fd33de0652a7 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Thu, 18 Aug 2016 14:46:32 +0100 +Subject: [PATCH] If you: TCLIBC=musl bitbake unwind TCLIBC=musl bitbake gcc-runtime -c cleansstate @@ -6,12 +9,12 @@ TCLIBC=musl bitbake gcc-runtime you will see libstdc++ fail to build due to finding libunwind's header file. -Khem: "When we build any of gcc components they expect to use internal version -and that works with glibc based gcc since the search headers first look into gcc -headers, however with musl the gcc headers are searched after the standard +Khem: "When we build any of gcc components they expect to use internal version +and that works with glibc based gcc since the search headers first look into gcc +headers, however with musl the gcc headers are searched after the standard headers ( which is by design the right thing )." -This patch hacks around the issue by looking for a define used during gcc-runtime's +This patch hacks around the issue by looking for a define used during gcc-runtime's build and skipping to the internal header in that case. [YOCTO #10129] @@ -20,11 +23,15 @@ RP 2016/8/18 Upstream-Status: Inappropriate [really need to fix gcc] -Index: git/include/unwind.h -=================================================================== ---- git.orig/include/unwind.h -+++ git/include/unwind.h -@@ -23,6 +23,10 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER L +--- + include/unwind.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/include/unwind.h b/include/unwind.h +index 7cf128d..31c2871 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 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/meta/recipes-support/libunwind/libunwind_1.3.1.bb b/meta/recipes-support/libunwind/libunwind_1.3.1.bb deleted file mode 100644 index 037e04c3c0..0000000000 --- a/meta/recipes-support/libunwind/libunwind_1.3.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -require libunwind.inc - -SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ - file://0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ - file://0002-backtrace-Use-only-with-glibc-and-uclibc.patch \ - 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[md5sum] = "a04f69d66d8e16f8bf3ab72a69112cd6" -SRC_URI[sha256sum] = "43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8" - -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" - -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" diff --git a/meta/recipes-support/libunwind/libunwind_1.4.0.bb b/meta/recipes-support/libunwind/libunwind_1.4.0.bb new file mode 100644 index 0000000000..f50205f1b9 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind_1.4.0.bb @@ -0,0 +1,24 @@ +require libunwind.inc + +SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV}.tar.gz \ + file://0001-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch \ + file://0002-backtrace-Use-only-with-glibc-and-uclibc.patch \ + 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[md5sum] = "5114504c74ac3992ac06aa551cd55678" +SRC_URI[sha256sum] = "df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435" + +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" + +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" -- cgit 1.2.3-korg