diff options
| author | Khem Raj <raj.khem@gmail.com> | 2021-10-20 16:09:48 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-10-20 16:57:31 -0700 |
| commit | 145a127636f83c30a609e76c04fc8f4a5ba96c11 (patch) | |
| tree | c1cf7103bd4d7297246c59715c1176fd59c3df32 | |
| parent | 354eca104326fc99ba389e5c81748dfe5d260c8e (diff) | |
| download | meta-openembedded-145a127636f83c30a609e76c04fc8f4a5ba96c11.tar.gz | |
mozjs: Fix build on mips/musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch | 35 | ||||
| -rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.1.0.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..b56f0b95b5 --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs/0004-use-asm-sgidefs.h.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andre McCurdy <amccurdy@gmail.com> | ||
| 3 | Date: Sat, 30 Apr 2016 15:29:06 -0700 | ||
| 4 | Subject: [PATCH] use <asm/sgidefs.h> | ||
| 5 | |||
| 6 | Build fix for MIPS with musl libc | ||
| 7 | |||
| 8 | The MIPS specific header <sgidefs.h> is provided by glibc and uclibc | ||
| 9 | but not by musl. Regardless of the libc, the kernel headers provide | ||
| 10 | <asm/sgidefs.h> which provides the same definitions, so use that | ||
| 11 | instead. | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | |||
| 15 | [Vincent: | ||
| 16 | Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] | ||
| 17 | |||
| 18 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 20 | Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> | ||
| 21 | --- | ||
| 22 | gdb/mips-linux-nat.c | 2 +- | ||
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 24 | |||
| 25 | --- a/mfbt/RandomNum.cpp | ||
| 26 | +++ b/mfbt/RandomNum.cpp | ||
| 27 | @@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV | ||
| 28 | # elif defined(__s390__) | ||
| 29 | # define GETRANDOM_NR 349 | ||
| 30 | # elif defined(__mips__) | ||
| 31 | -# include <sgidefs.h> | ||
| 32 | +# include <asm/sgidefs.h> | ||
| 33 | # if _MIPS_SIM == _MIPS_SIM_ABI32 | ||
| 34 | # define GETRANDOM_NR 4353 | ||
| 35 | # elif _MIPS_SIM == _MIPS_SIM_ABI64 | ||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.1.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.1.0.bb index 88aeb2dae5..cc985661d6 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.1.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_91.1.0.bb | |||
| @@ -7,6 +7,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire | |||
| 7 | file://0001-Cargo.toml-do-not-abort-on-panic.patch \ | 7 | file://0001-Cargo.toml-do-not-abort-on-panic.patch \ |
| 8 | file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ | 8 | file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ |
| 9 | file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ | 9 | file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ |
| 10 | file://0004-use-asm-sgidefs.h.patch \ | ||
| 10 | file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ | 11 | file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ |
| 11 | " | 12 | " |
| 12 | SRC_URI[sha256sum] = "3b913d6a52c95a8986123c98543f1273812a2d59f2891b4b1c604e35f4580766" | 13 | SRC_URI[sha256sum] = "3b913d6a52c95a8986123c98543f1273812a2d59f2891b4b1c604e35f4580766" |
