mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-09-26 00:11:04 +00:00
mozjs: update 128->140
Dropped versus mozjs-128, both now fixed upstream in 140: 0002-moz.configure-do-not-look-for-llvm-objdump.patch The LLVM_OBJDUMP check_prog block is gone from moz.configure entirely. 0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch js/moz.configure already asks for "icu-uc icu-i18n >= 76.1". Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Markus Volk
-43
@@ -1,43 +0,0 @@
|
||||
From 0f885ae37ef7cd94fd0712cefb5d3314fbcfdf44 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
Date: Fri, 1 Oct 2021 13:01:10 +0200
|
||||
Subject: [PATCH] moz.configure: do not look for llvm-objdump
|
||||
|
||||
This avoid dragging in a dependency that isn't even needed
|
||||
for js builds.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
||||
---
|
||||
moz.configure | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/moz.configure b/moz.configure
|
||||
index 804b9a375a..402e79e3b3 100755
|
||||
--- a/moz.configure
|
||||
+++ b/moz.configure
|
||||
@@ -390,15 +390,15 @@ def plain_llvm_or_prefixed(name, llvm_name=None):
|
||||
return plain_llvm_or_prefixed
|
||||
|
||||
|
||||
-llvm_objdump = check_prog(
|
||||
- "LLVM_OBJDUMP",
|
||||
- llvm_tool("llvm-objdump"),
|
||||
- what="llvm-objdump",
|
||||
- when="--enable-compile-environment",
|
||||
- paths=clang_search_path,
|
||||
-)
|
||||
-
|
||||
-add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
|
||||
+#llvm_objdump = check_prog(
|
||||
+# "LLVM_OBJDUMP",
|
||||
+# llvm_tool("llvm-objdump"),
|
||||
+# what="llvm-objdump",
|
||||
+# when="--enable-compile-environment",
|
||||
+# paths=clang_search_path,
|
||||
+#)
|
||||
+#
|
||||
+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump)
|
||||
|
||||
|
||||
def validate_readelf(path):
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
From 13b544e4ed51f41138bf200eb84552e169df87b0 Mon Sep 17 00:00:00 2001
|
||||
From: Changqing Li <changqing.li@windriver.com>
|
||||
Date: Thu, 11 Nov 2021 16:05:54 +0800
|
||||
Subject: [PATCH] util.configure: fix one occasionally reproduced configure
|
||||
failure
|
||||
|
||||
error:
|
||||
| checking whether the C++ compiler supports -Wno-range-loop-analysis...
|
||||
| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content:
|
||||
| DEBUG: | int
|
||||
| DEBUG: | main(void)
|
||||
| DEBUG: | {
|
||||
| DEBUG: |
|
||||
| DEBUG: | ;
|
||||
| DEBUG: | return 0;
|
||||
| DEBUG: | }
|
||||
| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c
|
||||
| DEBUG: The command returned non-zero exit status 1.
|
||||
| DEBUG: Its error output was:
|
||||
...
|
||||
| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler
|
||||
| os.remove(path)
|
||||
| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp'
|
||||
|
||||
It should be another process that deleted this file by using
|
||||
"rm -rf conftest*" inappropriately
|
||||
|
||||
Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667]
|
||||
|
||||
Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
||||
---
|
||||
build/moz.configure/util.configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
|
||||
index d93b91fcdd..47ab8b92b9 100644
|
||||
--- a/build/moz.configure/util.configure
|
||||
+++ b/build/moz.configure/util.configure
|
||||
@@ -256,7 +256,7 @@ def try_invoke_compiler(
|
||||
"C++": ".cpp",
|
||||
}[language]
|
||||
|
||||
- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True)
|
||||
+ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True)
|
||||
try:
|
||||
source = source.encode("ascii", "replace")
|
||||
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
From 8290fd619582651334fbfdfe7be887d539ce0f2c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 23 Nov 2024 13:28:33 -0800
|
||||
Subject: [PATCH] Link with icu-uc to fix build with ICU-76
|
||||
|
||||
Fixes
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
js/moz.configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/moz.configure b/js/moz.configure
|
||||
index 593b93acee..2181dca34b 100644
|
||||
--- a/js/moz.configure
|
||||
+++ b/js/moz.configure
|
||||
@@ -1305,7 +1305,7 @@ def enable_system_icu_option(enable_system_icu):
|
||||
return enable_system_icu
|
||||
|
||||
|
||||
-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu")
|
||||
+system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc", when="--with-system-icu")
|
||||
|
||||
|
||||
@depends(enable_system_icu_option)
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
From fe1c2336dfe5e8b4357d5e382edd1eba30cfa7d7 Mon Sep 17 00:00:00 2001
|
||||
From: x <a@b.c>
|
||||
Date: Wed, 2 Sep 2026 20:23:10 +0000
|
||||
Subject: [PATCH] util.configure: fix one occasionally reproduced configure
|
||||
failure
|
||||
|
||||
try_invoke_compiler() creates its temporary files with the prefix "conftest",
|
||||
which collides with the files other configure checks create under the same
|
||||
name. Under parallel builds this occasionally makes a check pick up a stale
|
||||
file and fail. Use a distinct prefix.
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
build/moz.configure/util.configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure
|
||||
index 8d31d112a..cb0884496 100644
|
||||
--- a/build/moz.configure/util.configure
|
||||
+++ b/build/moz.configure/util.configure
|
||||
@@ -169,7 +169,7 @@ normalize_path = normalize_path()
|
||||
def make_create_temporary_file():
|
||||
@contextmanager
|
||||
def create_temporary_file(suffix):
|
||||
- fd, path = mkstemp(prefix="conftest", suffix=suffix)
|
||||
+ fd, path = mkstemp(prefix="try_invoke_compiler_conftest", suffix=suffix)
|
||||
os.close(fd)
|
||||
yield path
|
||||
try:
|
||||
+1
-1
@@ -29,7 +29,7 @@ index cbd0472bf7..87d43ce9ec 100755
|
||||
@@ -1,3 +1,21 @@
|
||||
-#!/bin/sh
|
||||
-# See comment in cargo-linker.
|
||||
-eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"'
|
||||
-eval ${MOZ_CARGO_WRAP_HOST_LD} '"$@"' ${MOZ_CARGO_WRAP_HOST_LDFLAGS}
|
||||
+#!/usr/bin/env python3
|
||||
+
|
||||
+import os,sys
|
||||
+20
-18
@@ -1,35 +1,37 @@
|
||||
From 93d586d712bf34c243c6174425c78d3ab274c6a0 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 7 Jan 2025 15:17:16 -0800
|
||||
From 6fac6696adffc7b4f2bd47e12e8cae842736813f Mon Sep 17 00:00:00 2001
|
||||
From: x <a@b.c>
|
||||
Date: Wed, 2 Sep 2026 20:23:36 +0000
|
||||
Subject: [PATCH] Recognise riscv64gc and riscv32gc as valid architectures
|
||||
|
||||
Rust uses above for architecture in tuples
|
||||
rust names the riscv targets riscv64gc-* and riscv32gc-*, and OE passes that
|
||||
triple straight through to configure. config.sub rejects it.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
build/autoconf/config.sub | 2 +-
|
||||
build/autoconf/config.sub | 2 ++
|
||||
.../mozbuild/test/configure/test_toolchain_configure.py | 4 ++++
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
|
||||
index 2c6a07ab3c..f7ee82380c 100755
|
||||
index 4aaae46f6..10020ca01 100755
|
||||
--- a/build/autoconf/config.sub
|
||||
+++ b/build/autoconf/config.sub
|
||||
@@ -1236,7 +1236,7 @@ case $cpu-$vendor in
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
|
||||
| pru \
|
||||
@@ -1395,8 +1395,10 @@ case $cpu-$vendor in
|
||||
| pyramid \
|
||||
- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
|
||||
+ | riscv | riscv32 | riscv32be | riscv32gc | riscv64 | riscv64be | riscv64gc \
|
||||
| rl78 | romp | rs6000 | rx \
|
||||
| s390 | s390x \
|
||||
| score \
|
||||
| riscv \
|
||||
| riscv32 \
|
||||
+ | riscv32gc \
|
||||
| riscv32be \
|
||||
| riscv64 \
|
||||
+ | riscv64gc \
|
||||
| riscv64be \
|
||||
| rl78 \
|
||||
| romp \
|
||||
diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
||||
index 1be0d02e54..a476d787b2 100644
|
||||
index 481ce4687..b5ce7785b 100644
|
||||
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
||||
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
||||
@@ -1327,6 +1327,10 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
|
||||
@@ -1328,6 +1328,10 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
|
||||
"mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
|
||||
"riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
|
||||
"riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
|
||||
+19
-11
@@ -1,14 +1,22 @@
|
||||
This patch fixes configure with python 3.14
|
||||
From 459a43a9b1f767cde9a8bbb6016b5f9d17890370 Mon Sep 17 00:00:00 2001
|
||||
From: x <a@b.c>
|
||||
Date: Wed, 2 Sep 2026 20:23:13 +0000
|
||||
Subject: [PATCH] Replace deprecated ast.Str and ast.Index with ast.Constant
|
||||
|
||||
Signed-off-by: Markus Volk <f_l_k@t-online.de>
|
||||
ast.Str and ast.Index were removed in Python 3.12, which makes mozbuild fail
|
||||
to read moz.build files when the build host provides a newer python3.
|
||||
|
||||
Upstream-Status: Backport [https://github.com/mozilla-firefox/firefox/commit/d497aa4f770ca02f6083e93b94996a8fe32c2ff4]
|
||||
Upstream-Status: Backport [https://phabricator.services.mozilla.com/D261512]
|
||||
---
|
||||
python/mozbuild/mozbuild/frontend/reader.py | 14 +++++++-------
|
||||
.../mozbuild/mozbuild/vendor/rewrite_mozbuild.py | 6 ++----
|
||||
2 files changed, 9 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py
|
||||
index 5cb627b..c2dcafe 100644
|
||||
index 9f6292cb9..89bf9995c 100644
|
||||
--- a/python/mozbuild/mozbuild/frontend/reader.py
|
||||
+++ b/python/mozbuild/mozbuild/frontend/reader.py
|
||||
@@ -470,7 +470,7 @@ class TemplateFunction(object):
|
||||
@@ -470,7 +470,7 @@ class TemplateFunction:
|
||||
return c(
|
||||
ast.Subscript(
|
||||
value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
|
||||
@@ -17,7 +25,7 @@ index 5cb627b..c2dcafe 100644
|
||||
ctx=node.ctx,
|
||||
)
|
||||
)
|
||||
@@ -1035,8 +1035,8 @@ class BuildReader(object):
|
||||
@@ -1039,8 +1039,8 @@ class BuildReader:
|
||||
else:
|
||||
# Others
|
||||
assert isinstance(target.slice, ast.Index)
|
||||
@@ -25,10 +33,10 @@ index 5cb627b..c2dcafe 100644
|
||||
- key = target.slice.value.s
|
||||
+ assert isinstance(target.slice.value, ast.Constant)
|
||||
+ key = target.slice.value.value
|
||||
|
||||
return name, key
|
||||
|
||||
@@ -1044,11 +1044,11 @@ class BuildReader(object):
|
||||
elif isinstance(target, ast.Attribute):
|
||||
assert isinstance(target.attr, str)
|
||||
key = target.attr
|
||||
@@ -1051,11 +1051,11 @@ class BuildReader:
|
||||
value = node.value
|
||||
if isinstance(value, ast.List):
|
||||
for v in value.elts:
|
||||
@@ -45,7 +53,7 @@ index 5cb627b..c2dcafe 100644
|
||||
assignments = []
|
||||
|
||||
diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
|
||||
index 1590267..151d27c 100644
|
||||
index cfcc0f18b..de06b5881 100644
|
||||
--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
|
||||
+++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
|
||||
@@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node):
|
||||
+24
-18
@@ -6,23 +6,22 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
|
||||
SRC_URI = " \
|
||||
https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
|
||||
file://0001-Cargo.toml-do-not-abort-on-panic.patch \
|
||||
file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
|
||||
file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
|
||||
file://0004-use-asm-sgidefs.h.patch \
|
||||
file://0005-Add-RISCV32-support.patch \
|
||||
file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \
|
||||
file://0007-Rewrite-cargo-host-linker-in-python3.patch \
|
||||
file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
|
||||
file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
|
||||
file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
|
||||
file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
|
||||
file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
|
||||
file://0013-Fix-build-error-with-musl.patch \
|
||||
file://D261512.1755672843.patch \
|
||||
file://0002-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
|
||||
file://0003-use-asm-sgidefs.h.patch \
|
||||
file://0004-Add-RISCV32-support.patch \
|
||||
file://0005-util.configure-fix-one-occasionally-reproduced-confi.patch \
|
||||
file://0006-Rewrite-cargo-host-linker-in-python3.patch \
|
||||
file://0007-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
|
||||
file://0008-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
|
||||
file://0009-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
|
||||
file://0010-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
|
||||
file://0011-Fix-build-error-with-musl.patch \
|
||||
file://0012-Replace-deprecated-ast.Str-and-ast.Index-with-ast.Co.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "93b9ef6229f41cb22ff109b95bbf61a78395a0fe4b870192eeca22947cb09a53"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
|
||||
SRC_URI[sha256sum] = "358bb03c550f95172f1e31694e4287da3411560df91e931cb25210efdf90e524"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs140"
|
||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${UNPACKDIR}/firefox-${PV}"
|
||||
@@ -70,6 +69,7 @@ ICU:mipsarch = ""
|
||||
ICU:powerpc:toolchain-clang = ""
|
||||
|
||||
LDFLAGS:append:riscv32 = " -latomic"
|
||||
SECURITY_STRINGFORMAT = ""
|
||||
|
||||
do_configure() {
|
||||
cd ${B}
|
||||
@@ -86,9 +86,9 @@ do_configure() {
|
||||
}
|
||||
do_configure[cleandirs] += "${B}"
|
||||
|
||||
# The main build system is a Makefile that call cargo downstream.
|
||||
# We inherit cargo to get the environnement but need to switch back to
|
||||
# base_do_compile to do the Makefile base compilation.
|
||||
# The main build system is a Makefile that calls cargo downstream.
|
||||
# We inherit cargo to get the environment but need to switch back to
|
||||
# base_do_compile to do the Makefile based compilation.
|
||||
do_compile() {
|
||||
base_do_compile
|
||||
}
|
||||
@@ -107,6 +107,12 @@ do_install:append() {
|
||||
sed -e 's@${STAGING_DIR_HOST}@@g' \
|
||||
-i ${D}${bindir}/js${MAJ_VER}-config
|
||||
rm -f ${D}${libdir}/libjs_static.ajs
|
||||
# The installed SpiderMonkey headers require the consumer to define XP_UNIX
|
||||
# or XP_WIN; mozilla/UniquePtrExtensions.h #errors out otherwise. js.pc.in
|
||||
# ships only -isystem, and js-confdefs.h (which carries -DXP_UNIX in the
|
||||
# internal build) is deliberately not in EXPORTS, so declare it here.
|
||||
sed -i -e 's|^Cflags: |Cflags: -DXP_UNIX |' \
|
||||
${D}${libdir}/pkgconfig/mozjs-${MAJ_VER}.pc
|
||||
}
|
||||
|
||||
INSANE_SKIP += "32bit-time"
|
||||
Reference in New Issue
Block a user