diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-12-30 14:04:07 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-12-31 10:40:31 -0800 |
commit | 82c7bdd4cb4b0f1176afe0ad6a599f9db49f7055 (patch) | |
tree | 506804e669c78cb49afc75f9e9f5794cf44d9380 | |
parent | 3705caf227d4c78b05aee8a93ea1b2cf45c03272 (diff) | |
download | meta-openembedded-82c7bdd4cb4b0f1176afe0ad6a599f9db49f7055.tar.gz |
mozjs-102: Disable mozilla stackwalk on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch | 18 | ||||
-rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb | 1 |
2 files changed, 19 insertions, 0 deletions
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 @@ | |||
1 | Musl does not have stack unwinder like glibc therefore | ||
2 | we can not assume that its always available on musl, we | ||
3 | do need to check for target environment as well which | ||
4 | could be musl or glibc. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- a/mozglue/misc/StackWalk.cpp | ||
9 | +++ b/mozglue/misc/StackWalk.cpp | ||
10 | @@ -44,7 +44,7 @@ using namespace mozilla; | ||
11 | # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 | ||
12 | #endif | ||
13 | |||
14 | -#if (defined(linux) && \ | ||
15 | +#if (defined(linux) && defined(__GLIBC__) && \ | ||
16 | ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ | ||
17 | defined(HAVE__UNWIND_BACKTRACE))) | ||
18 | # 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 | |||
14 | file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ | 14 | file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ |
15 | file://0001-rewrite-cargo-host-linker-in-python3.patch \ | 15 | file://0001-rewrite-cargo-host-linker-in-python3.patch \ |
16 | file://py-3.11.patch \ | 16 | file://py-3.11.patch \ |
17 | file://musl-disable-stackwalk.patch \ | ||
17 | " | 18 | " |
18 | SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8" | 19 | SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8" |
19 | 20 | ||