From 82c7bdd4cb4b0f1176afe0ad6a599f9db49f7055 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Dec 2022 14:04:07 -0800 Subject: [PATCH] mozjs-102: Disable mozilla stackwalk on musl Signed-off-by: Khem Raj --- .../mozjs-102/musl-disable-stackwalk.patch | 18 ++++++++++++++++++ .../mozjs/mozjs-102_102.5.0.bb | 1 + 2 files changed, 19 insertions(+) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch new file mode 100644 index 0000000000..a3ba469a41 --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch @@ -0,0 +1,18 @@ +Musl does not have stack unwinder like glibc therefore +we can not assume that its always available on musl, we +do need to check for target environment as well which +could be musl or glibc. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/mozglue/misc/StackWalk.cpp ++++ b/mozglue/misc/StackWalk.cpp +@@ -44,7 +44,7 @@ using namespace mozilla; + # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 + #endif + +-#if (defined(linux) && \ ++#if (defined(linux) && defined(__GLIBC__) && \ + ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ + defined(HAVE__UNWIND_BACKTRACE))) + # define MOZ_STACKWALK_SUPPORTS_LINUX 1 diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb index a4d88a340a..d38ae10b87 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb @@ -14,6 +14,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ file://0001-rewrite-cargo-host-linker-in-python3.patch \ file://py-3.11.patch \ + file://musl-disable-stackwalk.patch \ " SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8"