summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch68
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb (renamed from meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb)34
2 files changed, 86 insertions, 16 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch
new file mode 100644
index 0000000000..1b35d2c094
--- /dev/null
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128/D261512.1755672843.patch
@@ -0,0 +1,68 @@
1This patch fixes configure with python 3.14
2
3Signed-off-by: Markus Volk <f_l_k@t-online.de>
4
5Upstream-Status: Backport [https://github.com/mozilla-firefox/firefox/commit/d497aa4f770ca02f6083e93b94996a8fe32c2ff4]
6
7diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py
8index 5cb627b..c2dcafe 100644
9--- a/python/mozbuild/mozbuild/frontend/reader.py
10+++ b/python/mozbuild/mozbuild/frontend/reader.py
11@@ -470,7 +470,7 @@ class TemplateFunction(object):
12 return c(
13 ast.Subscript(
14 value=c(ast.Name(id=self._global_name, ctx=ast.Load())),
15- slice=c(ast.Index(value=c(ast.Str(s=node.id)))),
16+ slice=c(ast.Index(value=c(ast.Constant(value=node.id)))),
17 ctx=node.ctx,
18 )
19 )
20@@ -1035,8 +1035,8 @@ class BuildReader(object):
21 else:
22 # Others
23 assert isinstance(target.slice, ast.Index)
24- assert isinstance(target.slice.value, ast.Str)
25- key = target.slice.value.s
26+ assert isinstance(target.slice.value, ast.Constant)
27+ key = target.slice.value.value
28
29 return name, key
30
31@@ -1044,11 +1044,11 @@ class BuildReader(object):
32 value = node.value
33 if isinstance(value, ast.List):
34 for v in value.elts:
35- assert isinstance(v, ast.Str)
36- yield v.s
37+ assert isinstance(v, ast.Constant)
38+ yield v.value
39 else:
40- assert isinstance(value, ast.Str)
41- yield value.s
42+ assert isinstance(value, ast.Constant)
43+ yield value.value
44
45 assignments = []
46
47diff --git a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
48index 1590267..151d27c 100644
49--- a/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
50+++ b/python/mozbuild/mozbuild/vendor/rewrite_mozbuild.py
51@@ -327,15 +327,13 @@ def assignment_node_to_source_filename_list(code, node):
52 """
53 if isinstance(node.value, ast.List) and "elts" in node.value._fields:
54 for f in node.value.elts:
55- if not isinstance(f, ast.Constant) and not isinstance(f, ast.Str):
56+ if not isinstance(f, ast.Constant):
57 log(
58 "Found non-constant source file name in list: ",
59 ast_get_source_segment(code, f),
60 )
61 return []
62- return [
63- f.value if isinstance(f, ast.Constant) else f.s for f in node.value.elts
64- ]
65+ return [f.value for f in node.value.elts]
66 elif isinstance(node.value, ast.ListComp):
67 # SOURCES += [f for f in foo if blah]
68 log("Could not find the files for " + ast_get_source_segment(code, node.value))
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb
index fbbe3749ba..635cad96cf 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs-128_128.5.2.bb
+++ b/meta-oe/recipes-extended/mozjs/mozjs-128_128.14.0.bb
@@ -3,22 +3,24 @@ HOMEPAGE = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonk
3LICENSE = "MPL-2.0" 3LICENSE = "MPL-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf"
5 5
6SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ 6SRC_URI = " \
7 file://0001-Cargo.toml-do-not-abort-on-panic.patch \ 7 https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \
8 file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ 8 file://0001-Cargo.toml-do-not-abort-on-panic.patch \
9 file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ 9 file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \
10 file://0004-use-asm-sgidefs.h.patch \ 10 file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \
11 file://0005-Add-RISCV32-support.patch \ 11 file://0004-use-asm-sgidefs.h.patch \
12 file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \ 12 file://0005-Add-RISCV32-support.patch \
13 file://0007-Rewrite-cargo-host-linker-in-python3.patch \ 13 file://0006-util.configure-fix-one-occasionally-reproduced-confi.patch \
14 file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \ 14 file://0007-Rewrite-cargo-host-linker-in-python3.patch \
15 file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \ 15 file://0008-Musl-does-not-have-stack-unwinder-like-glibc-therefo.patch \
16 file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \ 16 file://0009-Backport-patch-from-firefox-bugzilla-to-fix-compile-.patch \
17 file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \ 17 file://0010-The-ISB-instruction-isn-t-available-in-ARMv5-or-v6-s.patch \
18 file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \ 18 file://0011-Link-with-icu-uc-to-fix-build-with-ICU-76.patch \
19 file://0013-Fix-build-error-with-musl.patch \ 19 file://0012-Recognise-riscv64gc-and-riscv32gc-as-valid-architect.patch \
20 " 20 file://0013-Fix-build-error-with-musl.patch \
21SRC_URI[sha256sum] = "25d633eb81499cbda44b8c64fa1c1a5879d55024b864ef495d4997154d68358f" 21 file://D261512.1755672843.patch \
22"
23SRC_URI[sha256sum] = "93b9ef6229f41cb22ff109b95bbf61a78395a0fe4b870192eeca22947cb09a53"
22 24
23UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128" 25UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs128"
24UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" 26UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-26 15:47:41 +0000