转换LFS仓库为普通仓库
This commit is contained in:
commit
03eed0e3f4
36
0001-Skip-failing-tests-on-ppc64-and-s390x.patch
Normal file
36
0001-Skip-failing-tests-on-ppc64-and-s390x.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From db3a0a25b97377b388532b23e73a10d246f66496 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Mon, 3 Aug 2020 10:27:00 +0200
|
||||
Subject: [PATCH] Skip failing tests on ppc64 and s390x
|
||||
|
||||
ppc64 and s390x: non262/extensions/clone-errors.js
|
||||
s390x: test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
|
||||
s390x, ppc64 and aarch64: test262/built-ins/Date/UTC/fp-evaluation-order.js
|
||||
---
|
||||
js/src/tests/jstests.list | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list
|
||||
index 73ce42f..1797646 100644
|
||||
--- a/js/src/tests/jstests.list
|
||||
+++ b/js/src/tests/jstests.list
|
||||
@@ -53,6 +53,15 @@ skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list
|
||||
skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
|
||||
skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
|
||||
|
||||
+# Crashes on s390x and ppc64, avoid it
|
||||
+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
|
||||
+
|
||||
+# Crashes on s390x, ppc64, aarch64
|
||||
+skip-if(xulRuntime.XPCOMABI.match(/s390x|aarch64|ppc64-/)) script test262/built-ins/Date/UTC/fp-evaluation-order.js
|
||||
+
|
||||
+# Crashes on s390x, avoid it
|
||||
+skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
|
||||
+
|
||||
#####################################
|
||||
# Test262 tests disabled on browser #
|
||||
#####################################
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
127
CVE-2023-44488.patch
Normal file
127
CVE-2023-44488.patch
Normal file
@ -0,0 +1,127 @@
|
||||
From dfff1be88eaa0e0756c74b702484465b48b66fca Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Jiang <jianj@google.com>
|
||||
Date: Thu, 30 Jun 2022 13:48:56 -0400
|
||||
Subject: [PATCH] CVE-2023-44488 Fix bug with smaller width bigger size
|
||||
|
||||
Origin: https://github.com/webmproject/libvpx/commit/df9fd9d5b7325060b2b921558a1eb20ca7880937
|
||||
|
||||
---
|
||||
media/libvpx/libvpx/test/resize_test.cc | 9 +++----
|
||||
.../libvpx/vp9/common/vp9_alloccommon.c | 14 +++++-----
|
||||
media/libvpx/libvpx/vp9/encoder/vp9_encoder.c | 27 +++++++++++++++++--
|
||||
3 files changed, 35 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/media/libvpx/libvpx/test/resize_test.cc b/media/libvpx/libvpx/test/resize_test.cc
|
||||
index 5f323db5ab..55a2fe58c6 100644
|
||||
--- a/media/libvpx/libvpx/test/resize_test.cc
|
||||
+++ b/media/libvpx/libvpx/test/resize_test.cc
|
||||
@@ -101,11 +101,8 @@ void ScaleForFrameNumber(unsigned int frame, unsigned int initial_w,
|
||||
*h = initial_h;
|
||||
return;
|
||||
}
|
||||
- if (frame < 100) {
|
||||
- *w = initial_w * 7 / 10;
|
||||
- *h = initial_h * 16 / 10;
|
||||
- return;
|
||||
- }
|
||||
+ *w = initial_w * 7 / 10;
|
||||
+ *h = initial_h * 16 / 10;
|
||||
return;
|
||||
}
|
||||
if (frame < 10) {
|
||||
@@ -578,7 +575,7 @@ TEST_P(ResizeRealtimeTest, TestExternalResizeWorks) {
|
||||
}
|
||||
}
|
||||
|
||||
-TEST_P(ResizeRealtimeTest, DISABLED_TestExternalResizeSmallerWidthBiggerSize) {
|
||||
+TEST_P(ResizeRealtimeTest, TestExternalResizeSmallerWidthBiggerSize) {
|
||||
ResizingVideoSource video;
|
||||
video.flag_codec_ = true;
|
||||
video.smaller_width_larger_size_ = true;
|
||||
diff --git a/media/libvpx/libvpx/vp9/common/vp9_alloccommon.c b/media/libvpx/libvpx/vp9/common/vp9_alloccommon.c
|
||||
index 5702dca718..7841c5e793 100644
|
||||
--- a/media/libvpx/libvpx/vp9/common/vp9_alloccommon.c
|
||||
+++ b/media/libvpx/libvpx/vp9/common/vp9_alloccommon.c
|
||||
@@ -131,13 +131,7 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
|
||||
cm->free_mi(cm);
|
||||
if (cm->alloc_mi(cm, new_mi_size)) goto fail;
|
||||
}
|
||||
-
|
||||
- if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
|
||||
- // Create the segmentation map structure and set to 0.
|
||||
- free_seg_map(cm);
|
||||
- if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
|
||||
- }
|
||||
-
|
||||
+
|
||||
if (cm->above_context_alloc_cols < cm->mi_cols) {
|
||||
vpx_free(cm->above_context);
|
||||
cm->above_context = (ENTROPY_CONTEXT *)vpx_calloc(
|
||||
@@ -151,6 +145,12 @@ int vp9_alloc_context_buffers(VP9_COMMON *cm, int width, int height) {
|
||||
if (!cm->above_seg_context) goto fail;
|
||||
cm->above_context_alloc_cols = cm->mi_cols;
|
||||
}
|
||||
+
|
||||
+ if (cm->seg_map_alloc_size < cm->mi_rows * cm->mi_cols) {
|
||||
+ // Create the segmentation map structure and set to 0.
|
||||
+ free_seg_map(cm);
|
||||
+ if (alloc_seg_map(cm, cm->mi_rows * cm->mi_cols)) goto fail;
|
||||
+ }
|
||||
|
||||
if (vp9_alloc_loop_filter(cm)) goto fail;
|
||||
|
||||
diff --git a/media/libvpx/libvpx/vp9/encoder/vp9_encoder.c b/media/libvpx/libvpx/vp9/encoder/vp9_encoder.c
|
||||
index 4a37816e20..6efcf91066 100644
|
||||
--- a/media/libvpx/libvpx/vp9/encoder/vp9_encoder.c
|
||||
+++ b/media/libvpx/libvpx/vp9/encoder/vp9_encoder.c
|
||||
@@ -1937,6 +1937,17 @@ static void alloc_copy_partition_data(VP9_COMP *cpi) {
|
||||
}
|
||||
}
|
||||
|
||||
+static void free_copy_partition_data(VP9_COMP *cpi) {
|
||||
+ vpx_free(cpi->prev_partition);
|
||||
+ cpi->prev_partition = NULL;
|
||||
+ vpx_free(cpi->prev_segment_id);
|
||||
+ cpi->prev_segment_id = NULL;
|
||||
+ vpx_free(cpi->prev_variance_low);
|
||||
+ cpi->prev_variance_low = NULL;
|
||||
+ vpx_free(cpi->copied_frame_cnt);
|
||||
+ cpi->copied_frame_cnt = NULL;
|
||||
+}
|
||||
+
|
||||
void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
VP9_COMMON *const cm = &cpi->common;
|
||||
RATE_CONTROL *const rc = &cpi->rc;
|
||||
@@ -2021,6 +2032,8 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
new_mi_size = cm->mi_stride * calc_mi_size(cm->mi_rows);
|
||||
if (cm->mi_alloc_size < new_mi_size) {
|
||||
vp9_free_context_buffers(cm);
|
||||
+ vp9_free_pc_tree(&cpi->td);
|
||||
+ vpx_free(cpi->mbmi_ext_base);
|
||||
alloc_compressor_data(cpi);
|
||||
realloc_segmentation_maps(cpi);
|
||||
cpi->initial_width = cpi->initial_height = 0;
|
||||
@@ -2036,8 +2049,18 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
|
||||
update_frame_size(cpi);
|
||||
|
||||
if (last_w != cpi->oxcf.width || last_h != cpi->oxcf.height) {
|
||||
- memset(cpi->consec_zero_mv, 0,
|
||||
- cm->mi_rows * cm->mi_cols * sizeof(*cpi->consec_zero_mv));
|
||||
+ vpx_free(cpi->consec_zero_mv);
|
||||
+ CHECK_MEM_ERROR(
|
||||
+ cm, cpi->consec_zero_mv,
|
||||
+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(*cpi->consec_zero_mv)));
|
||||
+
|
||||
+ vpx_free(cpi->skin_map);
|
||||
+ CHECK_MEM_ERROR(
|
||||
+ cm, cpi->skin_map,
|
||||
+ vpx_calloc(cm->mi_rows * cm->mi_cols, sizeof(cpi->skin_map[0])));
|
||||
+
|
||||
+ free_copy_partition_data(cpi);
|
||||
+ alloc_copy_partition_data(cpi);
|
||||
if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ)
|
||||
vp9_cyclic_refresh_reset_resize(cpi);
|
||||
rc->rc_1_frame = 0;
|
||||
--
|
||||
2.27.0
|
||||
|
||||
33
CVE-2023-6209.patch
Normal file
33
CVE-2023-6209.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From f8389177cbce4fe098042850ada25feb7e6ba5a7 Mon Sep 17 00:00:00 2001
|
||||
From: Valentin Gosu <valentin.gosu@gmail.com>
|
||||
Date: Thu, 19 Oct 2023 07:40:28 +0000 (8 months ago)
|
||||
Subject: [PATCH] CVE-2023-6209
|
||||
|
||||
---
|
||||
netwerk/base/nsStandardURL.cpp | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/netwerk/base/nsStandardURL.cpp b/netwerk/base/nsStandardURL.cpp
|
||||
index b1b3ba1ef4..14aa8d5a5d 100644
|
||||
--- a/netwerk/base/nsStandardURL.cpp
|
||||
+++ b/netwerk/base/nsStandardURL.cpp
|
||||
@@ -2707,7 +2707,15 @@ nsStandardURL::Resolve(const nsACString& in, nsACString& out) {
|
||||
// locate result path
|
||||
resultPath = strstr(result, "://");
|
||||
if (resultPath) {
|
||||
- resultPath = strchr(resultPath + 3, '/');
|
||||
+ // If there are multiple slashes after :// we must ignore them
|
||||
+ // otherwise net_CoalesceDirs may think the host is a part of the path.
|
||||
+ resultPath += 3;
|
||||
+ if (protocol.IsEmpty() && Scheme() != "file") {
|
||||
+ while (*resultPath == '/') {
|
||||
+ resultPath++;
|
||||
+ }
|
||||
+ }
|
||||
+ resultPath = strchr(resultPath, '/');
|
||||
if (resultPath) {
|
||||
net_CoalesceDirs(coalesceFlag, resultPath);
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
73
D134330.diff
Normal file
73
D134330.diff
Normal file
@ -0,0 +1,73 @@
|
||||
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
||||
--- a/build/moz.configure/toolchain.configure
|
||||
+++ b/build/moz.configure/toolchain.configure
|
||||
@@ -1511,11 +1511,11 @@
|
||||
|
||||
|
||||
option(
|
||||
"--enable-linker",
|
||||
nargs=1,
|
||||
- help="Select the linker {bfd, gold, ld64, lld, lld-*}{|}",
|
||||
+ help="Select the linker {bfd, gold, ld64, lld, lld-*, mold}{|}",
|
||||
default=enable_linker_default,
|
||||
when=is_linker_option_enabled,
|
||||
)
|
||||
|
||||
|
||||
@@ -1546,11 +1546,11 @@
|
||||
|
||||
def is_valid_linker(linker):
|
||||
if target.kernel == "Darwin":
|
||||
valid_linkers = ("ld64", "lld")
|
||||
else:
|
||||
- valid_linkers = ("bfd", "gold", "lld")
|
||||
+ valid_linkers = ("bfd", "gold", "lld", "mold")
|
||||
if linker in valid_linkers:
|
||||
return True
|
||||
if "lld" in valid_linkers and linker.startswith("lld-"):
|
||||
return True
|
||||
return False
|
||||
@@ -1591,10 +1591,13 @@
|
||||
kind = "ld64"
|
||||
|
||||
elif retcode != 0:
|
||||
return None
|
||||
|
||||
+ elif "mold" in stdout:
|
||||
+ kind = "mold"
|
||||
+
|
||||
elif "GNU ld" in stdout:
|
||||
# We are using the normal linker
|
||||
kind = "bfd"
|
||||
|
||||
elif "GNU gold" in stdout:
|
||||
@@ -1697,11 +1700,11 @@
|
||||
# There's a wrinkle with MinGW: linker configuration is not enabled, so
|
||||
# `select_linker` is never invoked. Hard-code around it.
|
||||
@depends(select_linker, target, c_compiler)
|
||||
def gcc_use_gnu_ld(select_linker, target, c_compiler):
|
||||
if select_linker is not None and target.kernel != "Darwin":
|
||||
- return select_linker.KIND in ("bfd", "gold", "lld")
|
||||
+ return select_linker.KIND in ("bfd", "gold", "lld", "mold")
|
||||
if target.kernel == "WINNT" and c_compiler.type == "clang":
|
||||
return True
|
||||
return None
|
||||
|
||||
|
||||
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
||||
--- a/toolkit/moz.configure
|
||||
+++ b/toolkit/moz.configure
|
||||
@@ -1444,11 +1444,11 @@
|
||||
)
|
||||
|
||||
@depends("--enable-release", enable_linker)
|
||||
def default_elfhack(release, linker):
|
||||
# Disable elfhack when explicitly building with --enable-linker=lld
|
||||
- if linker and linker.origin != "default" and linker[0] == "lld":
|
||||
+ if linker and linker.origin != "default" and linker[0] in ("lld", "mold"):
|
||||
return False
|
||||
return bool(release)
|
||||
|
||||
with only_when(has_elfhack):
|
||||
option(
|
||||
|
||||
36
README.en.md
Normal file
36
README.en.md
Normal file
@ -0,0 +1,36 @@
|
||||
# mozjs102
|
||||
|
||||
#### Description
|
||||
SpiderMonkey JavaScript library
|
||||
|
||||
#### Software Architecture
|
||||
Software architecture description
|
||||
|
||||
#### Installation
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Instructions
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### Gitee Feature
|
||||
|
||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
37
README.md
Normal file
37
README.md
Normal file
@ -0,0 +1,37 @@
|
||||
# mozjs102
|
||||
|
||||
#### 介绍
|
||||
SpiderMonkey JavaScript library
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
|
||||
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
227
add-sw_64-support.patch
Normal file
227
add-sw_64-support.patch
Normal file
@ -0,0 +1,227 @@
|
||||
diff -auNr firefox-102.9.0/build/autoconf/config.guess firefox-102.9.0.sw/build/autoconf/config.guess
|
||||
--- firefox-102.9.0/build/autoconf/config.guess 2023-03-10 07:55:11.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/build/autoconf/config.guess 2024-12-06 16:49:07.723043262 +0800
|
||||
@@ -1143,6 +1143,9 @@
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
;;
|
||||
+ sw_64*:Linux:*:*)
|
||||
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
+ exit ;;
|
||||
tile*:Linux:*:*)
|
||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
;;
|
||||
diff -auNr firefox-102.9.0/build/autoconf/config.sub firefox-102.9.0.sw/build/autoconf/config.sub
|
||||
--- firefox-102.9.0/build/autoconf/config.sub 2023-03-10 07:55:11.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/build/autoconf/config.sub 2024-12-06 16:49:36.643213205 +0800
|
||||
@@ -1267,6 +1267,7 @@
|
||||
| sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
|
||||
| spu \
|
||||
+ | sw_64 \
|
||||
| tahoe \
|
||||
| thumbv7* \
|
||||
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
|
||||
diff -auNr firefox-102.9.0/build/moz.configure/init.configure firefox-102.9.0.sw/build/moz.configure/init.configure
|
||||
--- firefox-102.9.0/build/moz.configure/init.configure 2023-03-10 07:59:36.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/build/moz.configure/init.configure 2024-12-06 17:09:29.990869176 +0800
|
||||
@@ -530,6 +530,9 @@
|
||||
elif cpu.startswith("loongarch64"):
|
||||
canonical_cpu = "loongarch64"
|
||||
endianness = "little"
|
||||
+ elif cpu in ("sw_64"):
|
||||
+ canonical_cpu = "sw_64"
|
||||
+ endianness = "little"
|
||||
elif cpu == "sh4":
|
||||
canonical_cpu = "sh4"
|
||||
endianness = "little"
|
||||
diff -auNr firefox-102.9.0/intl/icu/source/config.guess firefox-102.9.0.sw/intl/icu/source/config.guess
|
||||
--- firefox-102.9.0/intl/icu/source/config.guess 2023-03-10 07:55:13.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/intl/icu/source/config.guess 2024-12-06 16:52:54.634376784 +0800
|
||||
@@ -1029,6 +1029,9 @@
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
+ sw_64*:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
+ exit ;;
|
||||
tile*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
||||
exit ;;
|
||||
diff -auNr firefox-102.9.0/intl/icu/source/config.sub firefox-102.9.0.sw/intl/icu/source/config.sub
|
||||
--- firefox-102.9.0/intl/icu/source/config.sub 2023-03-10 07:55:13.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/intl/icu/source/config.sub 2024-12-06 16:53:08.084455832 +0800
|
||||
@@ -308,6 +308,7 @@
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
| spu \
|
||||
+ | sw_64 \
|
||||
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
|
||||
| ubicom32 \
|
||||
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
|
||||
diff -auNr firefox-102.9.0/intl/icu/source/i18n/double-conversion-utils.h firefox-102.9.0.sw/intl/icu/source/i18n/double-conversion-utils.h
|
||||
--- firefox-102.9.0/intl/icu/source/i18n/double-conversion-utils.h 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/intl/icu/source/i18n/double-conversion-utils.h 2024-12-06 17:12:13.061850411 +0800
|
||||
@@ -142,6 +142,7 @@
|
||||
defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
|
||||
defined(__hppa__) || defined(__ia64__) || \
|
||||
defined(__mips__) || \
|
||||
+ defined(__sw_64__) || \
|
||||
defined(__loongarch__) || \
|
||||
defined(__nios2__) || defined(__ghs) || \
|
||||
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
|
||||
diff -auNr firefox-102.9.0/js/moz.configure firefox-102.9.0.sw/js/moz.configure
|
||||
--- firefox-102.9.0/js/moz.configure 2024-12-06 17:23:06.325903209 +0800
|
||||
+++ firefox-102.9.0.sw/js/moz.configure 2024-12-06 17:14:02.142450768 +0800
|
||||
@@ -251,6 +251,7 @@
|
||||
set_config("JS_CODEGEN_RISCV64", jit_codegen.riscv64)
|
||||
set_config("JS_CODEGEN_X86", jit_codegen.x86)
|
||||
set_config("JS_CODEGEN_X64", jit_codegen.x64)
|
||||
+set_config('JS_CODEGEN_SW64', jit_codegen.sw_64)
|
||||
set_define("JS_CODEGEN_NONE", jit_codegen.none)
|
||||
set_define("JS_CODEGEN_ARM", jit_codegen.arm)
|
||||
set_define("JS_CODEGEN_ARM64", jit_codegen.arm64)
|
||||
@@ -260,6 +261,7 @@
|
||||
set_define("JS_CODEGEN_RISCV64", jit_codegen.riscv64)
|
||||
set_define("JS_CODEGEN_X86", jit_codegen.x86)
|
||||
set_define("JS_CODEGEN_X64", jit_codegen.x64)
|
||||
+set_define('JS_CODEGEN_SW64', jit_codegen.sw_64)
|
||||
|
||||
# Profiling
|
||||
# =======================================================
|
||||
diff -auNr firefox-102.9.0/js/src/jit/LIR.h firefox-102.9.0.sw/js/src/jit/LIR.h
|
||||
--- firefox-102.9.0/js/src/jit/LIR.h 2024-12-06 17:23:06.185902165 +0800
|
||||
+++ firefox-102.9.0.sw/js/src/jit/LIR.h 2024-12-06 17:15:13.212841942 +0800
|
||||
@@ -1956,6 +1956,8 @@
|
||||
# include "jit/loong64/LIR-loong64.h"
|
||||
#elif defined(JS_CODEGEN_RISCV64)
|
||||
# include "jit/riscv64/LIR-riscv64.h"
|
||||
+#elif defined(JS_CODEGEN_SW64)
|
||||
+# include "jit/none/LIR-none.h"
|
||||
#elif defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_MIPS64)
|
||||
# if defined(JS_CODEGEN_MIPS32)
|
||||
# include "jit/mips32/LIR-mips32.h"
|
||||
diff -auNr firefox-102.9.0/memory/build/mozjemalloc.cpp firefox-102.9.0.sw/memory/build/mozjemalloc.cpp
|
||||
--- firefox-102.9.0/memory/build/mozjemalloc.cpp 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/memory/build/mozjemalloc.cpp 2024-12-06 17:16:27.533251012 +0800
|
||||
@@ -204,7 +204,7 @@
|
||||
#ifndef MOZ_DEBUG
|
||||
# if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && \
|
||||
!defined(__aarch64__) && !defined(__powerpc__) && !defined(XP_MACOSX) && \
|
||||
- !defined(__loongarch__)
|
||||
+ !defined(__loongarch__) && !defined(__sw_64__)
|
||||
# define MALLOC_STATIC_PAGESIZE 1
|
||||
# endif
|
||||
#endif
|
||||
@@ -474,6 +474,8 @@
|
||||
static const size_t gPageSize = 64_KiB;
|
||||
# elif defined(__loongarch64)
|
||||
static const size_t gPageSize = 16_KiB;
|
||||
+#elif defined(__sw_64__)
|
||||
+static const size_t gPageSize = 8_KiB;
|
||||
# else
|
||||
static const size_t gPageSize = 4_KiB;
|
||||
# endif
|
||||
diff -auNr firefox-102.9.0/mfbt/double-conversion/double-conversion/utils.h firefox-102.9.0.sw/mfbt/double-conversion/double-conversion/utils.h
|
||||
--- firefox-102.9.0/mfbt/double-conversion/double-conversion/utils.h 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/mfbt/double-conversion/double-conversion/utils.h 2024-12-06 17:05:09.579103919 +0800
|
||||
@@ -116,7 +116,7 @@
|
||||
defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \
|
||||
defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
|
||||
defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
|
||||
- defined(__SH4__) || defined(__alpha__) || \
|
||||
+ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || defined(__sw_64) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2) || defined(__ARMEB__) ||\
|
||||
defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \
|
||||
defined(__riscv) || defined(__e2k__) || \
|
||||
diff -auNr firefox-102.9.0/mfbt/tests/TestPoisonArea.cpp firefox-102.9.0.sw/mfbt/tests/TestPoisonArea.cpp
|
||||
--- firefox-102.9.0/mfbt/tests/TestPoisonArea.cpp 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/mfbt/tests/TestPoisonArea.cpp 2024-12-06 17:04:53.498994916 +0800
|
||||
@@ -168,6 +168,9 @@
|
||||
#elif defined __loongarch64
|
||||
# define RETURN_INSTR 0x4c000020 /* jirl zero, ra, 0 */
|
||||
|
||||
+#elif defined __sw_64 || __sw_64__
|
||||
+#define RETURN_INSTR 0x0bfa0000 /* ret zero,(ra),0 */
|
||||
+
|
||||
#elif defined __ia64
|
||||
struct ia64_instr {
|
||||
uint32_t mI[4];
|
||||
diff -auNr firefox-102.9.0/modules/freetype2/builds/unix/config.guess firefox-102.9.0.sw/modules/freetype2/builds/unix/config.guess
|
||||
--- firefox-102.9.0/modules/freetype2/builds/unix/config.guess 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/modules/freetype2/builds/unix/config.guess 2024-12-06 16:50:35.843561107 +0800
|
||||
@@ -1143,6 +1143,9 @@
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
;;
|
||||
+ sw_64*:Linux:*:*)
|
||||
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
+ exit ;;
|
||||
tile*:Linux:*:*)
|
||||
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
;;
|
||||
diff -auNr firefox-102.9.0/modules/freetype2/builds/unix/config.sub firefox-102.9.0.sw/modules/freetype2/builds/unix/config.sub
|
||||
--- firefox-102.9.0/modules/freetype2/builds/unix/config.sub 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/modules/freetype2/builds/unix/config.sub 2024-12-06 16:50:49.893643679 +0800
|
||||
@@ -1267,6 +1267,7 @@
|
||||
| sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
|
||||
| spu \
|
||||
+ | sw_64 \
|
||||
| tahoe \
|
||||
| thumbv7* \
|
||||
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
|
||||
diff -auNr firefox-102.9.0/nsprpub/build/autoconf/config.guess firefox-102.9.0.sw/nsprpub/build/autoconf/config.guess
|
||||
--- firefox-102.9.0/nsprpub/build/autoconf/config.guess 2023-03-10 07:55:17.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/nsprpub/build/autoconf/config.guess 2024-12-06 16:51:25.693854088 +0800
|
||||
@@ -1088,6 +1088,9 @@
|
||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
|
||||
exit ;;
|
||||
+ sw_64*:Linux:*:*)
|
||||
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
|
||||
+ exit ;;
|
||||
tile*:Linux:*:*)
|
||||
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
|
||||
exit ;;
|
||||
diff -auNr firefox-102.9.0/nsprpub/build/autoconf/config.sub firefox-102.9.0.sw/nsprpub/build/autoconf/config.sub
|
||||
--- firefox-102.9.0/nsprpub/build/autoconf/config.sub 2023-03-10 07:55:17.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/nsprpub/build/autoconf/config.sub 2024-12-06 16:51:37.293922250 +0800
|
||||
@@ -1240,6 +1240,7 @@
|
||||
| sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
|
||||
| spu \
|
||||
+ | sw_64 \
|
||||
| tahoe \
|
||||
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
|
||||
| tron \
|
||||
diff -auNr firefox-102.9.0/python/mozbuild/mozbuild/configure/constants.py firefox-102.9.0.sw/python/mozbuild/mozbuild/configure/constants.py
|
||||
--- firefox-102.9.0/python/mozbuild/mozbuild/configure/constants.py 2023-03-10 07:59:37.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/python/mozbuild/mozbuild/configure/constants.py 2024-12-06 17:06:24.349610772 +0800
|
||||
@@ -62,6 +62,7 @@
|
||||
"x86": 32,
|
||||
"x86_64": 64,
|
||||
"wasm32": 32,
|
||||
+ "sw_64": 64,
|
||||
}
|
||||
|
||||
CPU = EnumString.subclass(*CPU_bitness.keys())
|
||||
@@ -97,6 +98,7 @@
|
||||
("mips32", "__mips__"),
|
||||
("riscv64", "__riscv && __riscv_xlen == 64"),
|
||||
("loongarch64", "__loongarch64"),
|
||||
+ ("sw_64", "__sw_64"),
|
||||
("sh4", "__sh__"),
|
||||
("wasm32", "__wasm32__"),
|
||||
)
|
||||
diff -auNr firefox-102.9.0/toolkit/moz.configure firefox-102.9.0.sw/toolkit/moz.configure
|
||||
--- firefox-102.9.0/toolkit/moz.configure 2023-03-10 07:59:39.000000000 +0800
|
||||
+++ firefox-102.9.0.sw/toolkit/moz.configure 2024-12-06 17:19:38.254351045 +0800
|
||||
@@ -1292,6 +1292,7 @@
|
||||
"ia64",
|
||||
"mips32",
|
||||
"mips64",
|
||||
+ "sw_64",
|
||||
)
|
||||
or target.cpu.startswith("ppc")
|
||||
):
|
||||
38
copy-headers.patch
Normal file
38
copy-headers.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 3b3c8e37cca418e07bdeceaf3a601805df28d925 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Wed, 15 Jul 2020 08:27:39 +0200
|
||||
Subject: [PATCH] build: Copy headers on install instead of symlinking
|
||||
|
||||
Patch by Philip Chimento ported forward to mozjs78
|
||||
---
|
||||
python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
|
||||
index 858d4d4..8c229e8 100644
|
||||
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
|
||||
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
|
||||
@@ -1533,9 +1533,9 @@ class RecursiveMakeBackend(MakeBackend):
|
||||
" of srcdir-relative or absolute paths."
|
||||
)
|
||||
|
||||
- install_manifest.add_pattern_link(basepath, wild, dest_dir)
|
||||
+ install_manifest.add_pattern_copy(basepath, wild, dest_dir)
|
||||
else:
|
||||
- install_manifest.add_pattern_link(f.srcdir, f, dest_dir)
|
||||
+ install_manifest.add_pattern_copy(f.srcdir, f, dest_dir)
|
||||
elif isinstance(f, AbsolutePath):
|
||||
if not f.full_path.lower().endswith((".dll", ".pdb", ".so")):
|
||||
raise Exception(
|
||||
@@ -1546,7 +1546,7 @@ class RecursiveMakeBackend(MakeBackend):
|
||||
install_manifest.add_optional_exists(dest_file)
|
||||
absolute_files.append(f.full_path)
|
||||
else:
|
||||
- install_manifest.add_link(f.full_path, dest_file)
|
||||
+ install_manifest.add_copy(f.full_path, dest_file)
|
||||
else:
|
||||
install_manifest.add_optional_exists(dest_file)
|
||||
objdir_files.append(self._pretty_path(f, backend_file))
|
||||
--
|
||||
2.37.1
|
||||
|
||||
67
emitter.patch
Normal file
67
emitter.patch
Normal file
@ -0,0 +1,67 @@
|
||||
From d1d785c169345b81c76213f6dd9be32b4db60294 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Wed, 15 Jul 2020 08:39:47 +0200
|
||||
Subject: [PATCH] Build: allow LOCAL_INCLUDES paths with topsrcdir or topobjdir
|
||||
|
||||
---
|
||||
python/mozbuild/mozbuild/frontend/emitter.py | 10 ---------
|
||||
.../mozbuild/test/frontend/test_emitter.py | 22 -------------------
|
||||
2 files changed, 32 deletions(-)
|
||||
|
||||
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
|
||||
index 0b7ccef..a3c7f2f 100644
|
||||
--- a/python/mozbuild/mozbuild/frontend/emitter.py
|
||||
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
|
||||
@@ -1365,16 +1365,6 @@ class TreeMetadataEmitter(LoggingMixin):
|
||||
"(resolved to %s)" % (local_include, full_path),
|
||||
context,
|
||||
)
|
||||
- if (
|
||||
- full_path == context.config.topsrcdir
|
||||
- or full_path == context.config.topobjdir
|
||||
- ):
|
||||
- raise SandboxValidationError(
|
||||
- "Path specified in LOCAL_INCLUDES "
|
||||
- "(%s) resolves to the topsrcdir or topobjdir (%s), which is "
|
||||
- "not allowed" % (local_include, full_path),
|
||||
- context,
|
||||
- )
|
||||
include_obj = LocalInclude(context, local_include)
|
||||
local_includes.append(include_obj.path.full_path)
|
||||
yield include_obj
|
||||
diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
||||
index 99507fc..821de22 100644
|
||||
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
||||
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
|
||||
@@ -1076,28 +1076,6 @@ class TestEmitterBasic(unittest.TestCase):
|
||||
|
||||
self.assertEqual(local_includes, expected)
|
||||
|
||||
- def test_local_includes_invalid(self):
|
||||
- """Test that invalid LOCAL_INCLUDES are properly detected."""
|
||||
- reader = self.reader("local_includes-invalid/srcdir")
|
||||
-
|
||||
- with six.assertRaisesRegex(
|
||||
- self,
|
||||
- SandboxValidationError,
|
||||
- "Path specified in LOCAL_INCLUDES.*resolves to the "
|
||||
- "topsrcdir or topobjdir",
|
||||
- ):
|
||||
- self.read_topsrcdir(reader)
|
||||
-
|
||||
- reader = self.reader("local_includes-invalid/objdir")
|
||||
-
|
||||
- with six.assertRaisesRegex(
|
||||
- self,
|
||||
- SandboxValidationError,
|
||||
- "Path specified in LOCAL_INCLUDES.*resolves to the "
|
||||
- "topsrcdir or topobjdir",
|
||||
- ):
|
||||
- self.read_topsrcdir(reader)
|
||||
-
|
||||
def test_local_includes_file(self):
|
||||
"""Test that a filename can't be used in LOCAL_INCLUDES."""
|
||||
reader = self.reader("local_includes-filename")
|
||||
--
|
||||
2.37.1
|
||||
|
||||
55
enable-jit-compiler-of-loongarch64-port-by-default.patch
Normal file
55
enable-jit-compiler-of-loongarch64-port-by-default.patch
Normal file
@ -0,0 +1,55 @@
|
||||
From 4afb7390412988eb41ccaf264dea45876f0801d9 Mon Sep 17 00:00:00 2001
|
||||
From: liuyu <liuyu@loongson.cn>
|
||||
Date: Thu, 7 Sep 2023 19:17:52 +0800
|
||||
Subject: [PATCH] Enable JIT compiler of loong64 port by default
|
||||
|
||||
---
|
||||
js/moz.configure | 2 ++
|
||||
js/src/wasm/WasmSignalHandlers.cpp | 10 +++++-----
|
||||
2 files changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/js/moz.configure b/js/moz.configure
|
||||
index 7a241cac76..2bb7979e36 100644
|
||||
--- a/js/moz.configure
|
||||
+++ b/js/moz.configure
|
||||
@@ -234,6 +234,8 @@ def jit_codegen(jit_enabled, simulator, target):
|
||||
return namespace(arm64=True)
|
||||
elif target.cpu == "x86_64":
|
||||
return namespace(x64=True)
|
||||
+ elif target.cpu == "loongarch64":
|
||||
+ return namespace(loong64=True)
|
||||
|
||||
return namespace(**{str(target.cpu): True})
|
||||
|
||||
diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
|
||||
index 4a45905431..074c373106 100644
|
||||
--- a/js/src/wasm/WasmSignalHandlers.cpp
|
||||
+++ b/js/src/wasm/WasmSignalHandlers.cpp
|
||||
@@ -158,10 +158,10 @@ using mozilla::DebugOnly;
|
||||
# define R32_sig(p) ((p)->uc_mcontext.gp_regs[32])
|
||||
# endif
|
||||
# if defined(__linux__) && defined(__loongarch__)
|
||||
-# define EPC_sig(p) ((p)->uc_mcontext.pc)
|
||||
-# define RRA_sig(p) ((p)->uc_mcontext.gregs[1])
|
||||
-# define RSP_sig(p) ((p)->uc_mcontext.gregs[3])
|
||||
-# define RFP_sig(p) ((p)->uc_mcontext.gregs[22])
|
||||
+# define EPC_sig(p) ((p)->uc_mcontext.__pc)
|
||||
+# define RRA_sig(p) ((p)->uc_mcontext.__gregs[1])
|
||||
+# define R03_sig(p) ((p)->uc_mcontext.__gregs[3])
|
||||
+# define RFP_sig(p) ((p)->uc_mcontext.__gregs[22])
|
||||
# endif
|
||||
# elif defined(__NetBSD__)
|
||||
# define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
|
||||
@@ -403,7 +403,7 @@ struct macos_aarch64_context {
|
||||
# elif defined(__loongarch__)
|
||||
# define PC_sig(p) EPC_sig(p)
|
||||
# define FP_sig(p) RFP_sig(p)
|
||||
-# define SP_sig(p) RSP_sig(p)
|
||||
+# define SP_sig(p) R03_sig(p)
|
||||
# define LR_sig(p) RRA_sig(p)
|
||||
# endif
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
BIN
firefox-102.9.0esr.source.tar.xz
Normal file
BIN
firefox-102.9.0esr.source.tar.xz
Normal file
Binary file not shown.
26
fix-soname.patch
Normal file
26
fix-soname.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From d21c7cb9343d8c495d987e71be0f35887574c820 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Wed, 15 Jul 2020 08:21:47 +0200
|
||||
Subject: [PATCH] Add soname switch to linker, regardless of Operating System
|
||||
|
||||
Fix backported from Debian: http://bugs.debian.org/746705
|
||||
---
|
||||
config/rules.mk | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/config/rules.mk b/config/rules.mk
|
||||
index 90a9946..dc87789 100644
|
||||
--- a/config/rules.mk
|
||||
+++ b/config/rules.mk
|
||||
@@ -291,6 +291,8 @@ ifeq ($(OS_ARCH),GNU)
|
||||
OS_CPPFLAGS += -DPATH_MAX=1024 -DMAXPATHLEN=1024
|
||||
endif
|
||||
|
||||
+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
|
||||
+
|
||||
#
|
||||
# MINGW32
|
||||
#
|
||||
--
|
||||
2.37.1
|
||||
|
||||
11
icu-76.patch
Normal file
11
icu-76.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- firefox-102.9.0/js/moz.configure.orig 2025-03-11 12:47:41.254391903 +0800
|
||||
+++ firefox-102.9.0/js/moz.configure 2025-03-11 12:48:04.238721011 +0800
|
||||
@@ -1153,7 +1153,7 @@
|
||||
# ======================================================
|
||||
system_lib_option("--with-system-icu", help="Use system ICU")
|
||||
|
||||
-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu")
|
||||
+system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1 icu-uc >= 71.1", when="--with-system-icu")
|
||||
|
||||
|
||||
@depends("--with-system-icu")
|
||||
44
icu_sources_data-Write-command-output-to-our-stderr.patch
Normal file
44
icu_sources_data-Write-command-output-to-our-stderr.patch
Normal file
@ -0,0 +1,44 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Mon, 9 Oct 2017 09:23:14 +0100
|
||||
Subject: icu_sources_data: Write command output to our stderr
|
||||
|
||||
Saying "See output in /tmp/foobar" is all very well for a developer
|
||||
build, but on a buildd our /tmp is going to get thrown away after
|
||||
the build. Just log the usual way instead.
|
||||
---
|
||||
intl/icu_sources_data.py | 16 ++++------------
|
||||
1 file changed, 4 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
|
||||
index 4db52af..d62960d 100644
|
||||
--- a/intl/icu_sources_data.py
|
||||
+++ b/intl/icu_sources_data.py
|
||||
@@ -188,21 +188,13 @@ def update_sources(topsrcdir):
|
||||
|
||||
def try_run(name, command, cwd=None, **kwargs):
|
||||
try:
|
||||
- with tempfile.NamedTemporaryFile(prefix=name, delete=False) as f:
|
||||
- subprocess.check_call(
|
||||
- command, cwd=cwd, stdout=f, stderr=subprocess.STDOUT, **kwargs
|
||||
- )
|
||||
- except subprocess.CalledProcessError:
|
||||
- print(
|
||||
- """Error running "{}" in directory {}
|
||||
- See output in {}""".format(
|
||||
- " ".join(command), cwd, f.name
|
||||
- ),
|
||||
- file=sys.stderr,
|
||||
+ subprocess.check_call(
|
||||
+ command, cwd=cwd, stdout=sys.stderr, stderr=subprocess.STDOUT, **kwargs
|
||||
)
|
||||
+ except subprocess.CalledProcessError:
|
||||
+ print('''Error running "{}" in directory {}'''.format(' '.join(command), cwd), file=sys.stderr)
|
||||
return False
|
||||
else:
|
||||
- os.unlink(f.name)
|
||||
return True
|
||||
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
29
icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
Normal file
29
icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From: Simon McVittie <smcv@debian.org>
|
||||
Date: Mon, 9 Oct 2017 09:22:12 +0100
|
||||
Subject: icu_sources_data.py: Decouple from Mozilla build system
|
||||
|
||||
mozpack.path is a wrapper around os.path that normalizes path
|
||||
separators on Windows, but on Unix we only have one path separator
|
||||
so there's nothing to normalize. Avoid needing to import all of it.
|
||||
---
|
||||
intl/icu_sources_data.py | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/intl/icu_sources_data.py b/intl/icu_sources_data.py
|
||||
index 2936df9..4db52af 100644
|
||||
--- a/intl/icu_sources_data.py
|
||||
+++ b/intl/icu_sources_data.py
|
||||
@@ -21,7 +21,9 @@ import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
-from mozpack import path as mozpath
|
||||
+# Close enough
|
||||
+import os.path as mozpath
|
||||
+mozpath.normsep = lambda p: p
|
||||
|
||||
# The following files have been determined to be dead/unused by a
|
||||
# semi-automated analysis. You can just remove any of the files below
|
||||
--
|
||||
2.31.1
|
||||
|
||||
28
init_patch.patch
Normal file
28
init_patch.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 00414eb67ab0591911167155963b5524fbf2b0c0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Mon, 9 Aug 2021 14:38:58 +0200
|
||||
Subject: [PATCH] Don't throw InvalidOptionError on invalid options
|
||||
|
||||
---
|
||||
python/mozbuild/mozbuild/configure/__init__.py | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py
|
||||
index f3167f6..c9e1132 100644
|
||||
--- a/python/mozbuild/mozbuild/configure/__init__.py
|
||||
+++ b/python/mozbuild/mozbuild/configure/__init__.py
|
||||
@@ -557,10 +557,7 @@ class ConfigureSandbox(dict):
|
||||
for arg in self._helper:
|
||||
without_value = arg.split("=", 1)[0]
|
||||
msg = "Unknown option: %s" % without_value
|
||||
- if self._help:
|
||||
- self._logger.warning(msg)
|
||||
- else:
|
||||
- raise InvalidOptionError(msg)
|
||||
+ self._logger.warning(msg)
|
||||
|
||||
# Run the execution queue
|
||||
for func, args in self._execution_queue:
|
||||
--
|
||||
2.31.1
|
||||
|
||||
14
known_failures.txt
Normal file
14
known_failures.txt
Normal file
@ -0,0 +1,14 @@
|
||||
non262/Intl/available-locales-resolved.js
|
||||
non262/Intl/available-locales-supported.js
|
||||
non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
|
||||
non262/Intl/DateTimeFormat/tz-environment-variable.js
|
||||
non262/Intl/DateTimeFormat/day-period-hour-cycle.js
|
||||
non262/Intl/DateTimeFormat/timeZone_version.js
|
||||
non262/Date/toString-localized.js
|
||||
non262/Date/reset-time-zone-cache-same-offset.js
|
||||
non262/Date/time-zones-imported.js
|
||||
non262/Date/time-zones-historic.js
|
||||
non262/Date/toString-localized-posix.js
|
||||
non262/Date/time-zone-path.js
|
||||
non262/Intl/supportedValuesOf-timeZones-canonical.js
|
||||
non262/Intl/DateTimeFormat/timeZone_backward_links.js
|
||||
282
mozjs102.spec
Normal file
282
mozjs102.spec
Normal file
@ -0,0 +1,282 @@
|
||||
%global major 102
|
||||
|
||||
# LTO - Enable in Release builds, but consider disabling for development as it increases compile time
|
||||
%global build_with_lto 1
|
||||
|
||||
# Require tests to pass?
|
||||
%global require_tests 0
|
||||
|
||||
%if 0%{?build_with_lto}
|
||||
# LTO is the default
|
||||
%else
|
||||
%define _lto_cflags %{nil}
|
||||
%endif
|
||||
|
||||
# Big endian platforms
|
||||
%ifarch ppc ppc64 s390 s390x
|
||||
%global big_endian 1
|
||||
%endif
|
||||
|
||||
%ifarch riscv64
|
||||
%global build_mold 0
|
||||
%endif
|
||||
|
||||
Name: mozjs%{major}
|
||||
Version: 102.9.0
|
||||
Release: 8
|
||||
Summary: SpiderMonkey JavaScript library
|
||||
License: MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later
|
||||
URL: https://hg.mozilla.org/releases/mozilla-esr102
|
||||
Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
|
||||
|
||||
# Known failures with system libicu
|
||||
Source1: known_failures.txt
|
||||
|
||||
# Patches from mozjs68, rebased for mozjs78:
|
||||
Patch01: fix-soname.patch
|
||||
Patch02: copy-headers.patch
|
||||
Patch03: tests-increase-timeout.patch
|
||||
Patch09: icu_sources_data.py-Decouple-from-Mozilla-build-system.patch
|
||||
Patch10: icu_sources_data-Write-command-output-to-our-stderr.patch
|
||||
|
||||
# Build fixes - https://hg.mozilla.org/mozilla-central/rev/ca36a6c4f8a4a0ddaa033fdbe20836d87bbfb873
|
||||
Patch12: emitter.patch
|
||||
Patch13: tests-Use-native-TemporaryDirectory.patch
|
||||
|
||||
# Build fixes
|
||||
Patch14: init_patch.patch
|
||||
Patch15: remove-sloppy-m4-detection-from-bundled-autoconf.patch
|
||||
Patch16: icu-76.patch
|
||||
|
||||
# TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed
|
||||
Patch20: spidermonkey_checks_disable.patch
|
||||
|
||||
# s390x/ppc64 fixes
|
||||
Patch21: 0001-Skip-failing-tests-on-ppc64-and-s390x.patch
|
||||
|
||||
# riscv64 sipdermonkey jit
|
||||
Patch22: spidermonkey-riscv64-plct.patch
|
||||
Patch23: CVE-2023-44488.patch
|
||||
Patch25: CVE-2023-6209.patch
|
||||
|
||||
|
||||
# mold
|
||||
%if 0%{?build_mold}
|
||||
Patch23: D134330.diff
|
||||
%endif
|
||||
# Enable jit compiler in loongarch64
|
||||
Patch24: enable-jit-compiler-of-loongarch64-port-by-default.patch
|
||||
|
||||
# add sw_64 support
|
||||
Patch26: add-sw_64-support.patch
|
||||
|
||||
BuildRequires: cargo
|
||||
BuildRequires: ccache
|
||||
BuildRequires: clang-devel
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: m4
|
||||
BuildRequires: make
|
||||
%if !0%{?rhel}
|
||||
BuildRequires: nasm
|
||||
%endif
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: llvm
|
||||
BuildRequires: rust
|
||||
BuildRequires: rustfmt
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-six
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: wget
|
||||
BuildRequires: zip
|
||||
%if 0%{?build_mold}
|
||||
BuildRequires: mold
|
||||
%endif
|
||||
|
||||
%description
|
||||
SpiderMonkey is the code-name for Mozilla Firefox's C++ implementation of
|
||||
JavaScript. It is intended to be embedded in other applications
|
||||
that provide host environments for JavaScript.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -n firefox-%{version}/js/src -N
|
||||
|
||||
pushd ../..
|
||||
%autopatch -p1
|
||||
|
||||
# Copy out the LICENSE file
|
||||
cp LICENSE js/src/
|
||||
|
||||
# Copy out file containing known test failures with system libicu
|
||||
cp %{SOURCE1} js/src/
|
||||
|
||||
# Remove zlib directory (to be sure using system version)
|
||||
rm -rf modules/zlib
|
||||
|
||||
# Remove unneeded bundled stuff
|
||||
rm -rf js/src/devtools/automation/variants/
|
||||
rm -rf js/src/octane/
|
||||
rm -rf js/src/ctypes/libffi/
|
||||
|
||||
popd
|
||||
|
||||
%build
|
||||
%if 0%{?build_with_lto}
|
||||
# https://github.com/ptomato/mozjs/commit/36bb7982b41e0ef9a65f7174252ab996cd6777bd
|
||||
export CARGO_PROFILE_RELEASE_LTO=true
|
||||
%endif
|
||||
|
||||
# Use bundled autoconf
|
||||
export M4=m4
|
||||
export AWK=awk
|
||||
export AC_MACRODIR=%{_builddir}/firefox-%{version}/build/autoconf/
|
||||
|
||||
sh ../../build/autoconf/autoconf.sh --localdir=%{_builddir}/firefox-%{version}/js/src configure.in > configure
|
||||
chmod +x configure
|
||||
|
||||
%configure \
|
||||
--with-system-icu \
|
||||
--with-system-zlib \
|
||||
--disable-tests \
|
||||
--disable-strip \
|
||||
--with-intl-api \
|
||||
--enable-readline \
|
||||
--enable-shared-js \
|
||||
--enable-optimize \
|
||||
--disable-debug \
|
||||
--enable-pie \
|
||||
--disable-jemalloc \
|
||||
%if 0%{?build_mold}
|
||||
--enable-linker=mold \
|
||||
%endif
|
||||
%{nil}
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
# Fix permissions
|
||||
chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
# Avoid multilib conflicts
|
||||
case `uname -i` in
|
||||
i386 | ppc | s390 | sparc )
|
||||
wordsize="32"
|
||||
;;
|
||||
x86_64 | ppc64 | s390x | sparc64 | riscv64 | loongarch64 )
|
||||
wordsize="64"
|
||||
;;
|
||||
*)
|
||||
wordsize=""
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -n "$wordsize"
|
||||
then
|
||||
mv %{buildroot}%{_includedir}/mozjs-%{major}/js-config.h \
|
||||
%{buildroot}%{_includedir}/mozjs-%{major}/js-config-$wordsize.h
|
||||
|
||||
cat >%{buildroot}%{_includedir}/mozjs-%{major}/js-config.h <<EOF
|
||||
#ifndef JS_CONFIG_H_MULTILIB
|
||||
#define JS_CONFIG_H_MULTILIB
|
||||
|
||||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
# include "js-config-32.h"
|
||||
#elif __WORDSIZE == 64
|
||||
# include "js-config-64.h"
|
||||
#else
|
||||
# error "unexpected value for __WORDSIZE macro"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
# Remove unneeded files
|
||||
rm %{buildroot}%{_bindir}/js%{major}-config
|
||||
rm %{buildroot}%{_libdir}/libjs_static.ajs
|
||||
|
||||
# Rename library and create symlinks, following fix-soname.patch
|
||||
mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \
|
||||
%{buildroot}%{_libdir}/libmozjs-%{major}.so.0.0.0
|
||||
ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0
|
||||
ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
|
||||
|
||||
%check
|
||||
# Run SpiderMonkey tests
|
||||
%if 0%{?require_tests}
|
||||
%{__python3} tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major}
|
||||
%else
|
||||
%{__python3} tests/jstests.py -d -s -t 2400 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || :
|
||||
%endif
|
||||
|
||||
# Run basic JIT tests
|
||||
%if 0%{?require_tests}
|
||||
|
||||
# large-arraybuffers/basic.js fails on s390x
|
||||
%ifarch s390 s390x
|
||||
%{__python3} jit-test/jit_test.py -s -t 2400 --no-progress -x large-arraybuffers/basic.js ../../js/src/dist/bin/js%{major} basic
|
||||
%else
|
||||
%{__python3} jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic
|
||||
%endif
|
||||
|
||||
%else
|
||||
%{__python3} jit-test/jit_test.py -s -t 2400 --no-progress ../../js/src/dist/bin/js%{major} basic || :
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc README.html
|
||||
%license LICENSE
|
||||
%{_libdir}/libmozjs-%{major}.so.0*
|
||||
|
||||
%files devel
|
||||
%{_bindir}/js%{major}
|
||||
%{_libdir}/libmozjs-%{major}.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_includedir}/mozjs-%{major}/
|
||||
|
||||
%changelog
|
||||
* Tue Mar 11 2025 Funda Wang <fundawang@yeah.net> - 102.9.0-8
|
||||
- fix build with icu 76
|
||||
|
||||
* Mon Mar 10 2025 mahailiang <mahailiang@uniontech.com> - 102.9.0-7
|
||||
- add sw_64 support
|
||||
|
||||
* Wed Jul 10 2024 liweigang <liweiganga@uniontech.com> - 102.9.0-6
|
||||
- enable debug package
|
||||
|
||||
* Wed Jul 10 2024 lvfei <lvfei@kylinos.cn> - 102.9.0-5
|
||||
- Fix CVE-2023-6209
|
||||
|
||||
* Tue Jun 25 2024 lvfei <lvfei@kylinos.cn> - 102.9.0-4
|
||||
- Fix CVE-2023-44488.patch
|
||||
|
||||
* Thu Apr 11 2024 misaka00251 <liuxin@iscas.ac.cn> - 102.9.0-3
|
||||
- Disable mold for riscv64
|
||||
|
||||
* Thu Mar 28 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 102.9.0-2
|
||||
- fix build error for loongarch64
|
||||
|
||||
* Thu Mar 16 2023 Jingwiw <wangjingwei@iscas.ac.cn> - 102.9.0-1
|
||||
- upgrade to 102.9.0
|
||||
- add sipdermonkey jit support for riscv64
|
||||
|
||||
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 102.6.0-1
|
||||
- Initial package.
|
||||
|
||||
5
mozjs102.yaml
Normal file
5
mozjs102.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
version_control: NA
|
||||
src_repo:
|
||||
tag_prefix:
|
||||
separator:
|
||||
URL: https://hg.mozilla.org/releases/mozilla-esr102
|
||||
29
remove-sloppy-m4-detection-from-bundled-autoconf.patch
Normal file
29
remove-sloppy-m4-detection-from-bundled-autoconf.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 2d99a7b076578a3394fb9d5be6eb44f9cfebc681 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Mon, 9 Aug 2021 16:15:37 +0200
|
||||
Subject: [PATCH] Remove sloppy m4 detection from bundled autoconf
|
||||
|
||||
---
|
||||
build/autoconf/autoconf.sh | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh
|
||||
index ceb8a25..606c74e 100644
|
||||
--- a/build/autoconf/autoconf.sh
|
||||
+++ b/build/autoconf/autoconf.sh
|
||||
@@ -114,12 +114,6 @@ fi
|
||||
|
||||
# Use the frozen version of Autoconf if available.
|
||||
r= f=
|
||||
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
|
||||
-case `$M4 --help < /dev/null 2>&1` in
|
||||
-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
|
||||
-*traditional*) ;;
|
||||
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
|
||||
-esac
|
||||
|
||||
$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
|
||||
{ rm -f $tmpin $tmpout; exit 2; }
|
||||
--
|
||||
2.31.1
|
||||
|
||||
36157
spidermonkey-riscv64-plct.patch
Normal file
36157
spidermonkey-riscv64-plct.patch
Normal file
File diff suppressed because it is too large
Load Diff
22
spidermonkey_checks_disable.patch
Normal file
22
spidermonkey_checks_disable.patch
Normal file
@ -0,0 +1,22 @@
|
||||
From 6ebe8ce6a3267c96454de3cd453269b4c4053a3e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Mon, 9 Aug 2021 14:41:14 +0200
|
||||
Subject: [PATCH] Don't die on SpiderMonkey checks
|
||||
|
||||
---
|
||||
config/run_spidermonkey_checks.py | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/config/run_spidermonkey_checks.py b/config/run_spidermonkey_checks.py
|
||||
index 0f842d9..b49db52 100644
|
||||
--- a/config/run_spidermonkey_checks.py
|
||||
+++ b/config/run_spidermonkey_checks.py
|
||||
@@ -11,5 +11,3 @@ import sys
|
||||
def main(output, lib_file, *scripts):
|
||||
for script in scripts:
|
||||
retcode = subprocess.call([sys.executable, script], cwd=buildconfig.topsrcdir)
|
||||
- if retcode != 0:
|
||||
- raise Exception(script + " failed")
|
||||
--
|
||||
2.31.1
|
||||
|
||||
66
tests-Use-native-TemporaryDirectory.patch
Normal file
66
tests-Use-native-TemporaryDirectory.patch
Normal file
@ -0,0 +1,66 @@
|
||||
From 1af9fdd2124547099eb0cf5a71b513ef5592dbf9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Tue, 10 Aug 2021 00:00:50 +0200
|
||||
Subject: [PATCH] Tests: Use native TemporaryDirectory
|
||||
|
||||
Without ugly wrapper for Py < 3.2 that doesn't work half of the times...
|
||||
---
|
||||
js/src/jit-test/jit_test.py | 2 +-
|
||||
js/src/tests/jstests.py | 2 +-
|
||||
js/src/tests/lib/tempfile.py | 17 +----------------
|
||||
3 files changed, 3 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/js/src/jit-test/jit_test.py b/js/src/jit-test/jit_test.py
|
||||
index f5d7794..8d443aa 100755
|
||||
--- a/js/src/jit-test/jit_test.py
|
||||
+++ b/js/src/jit-test/jit_test.py
|
||||
@@ -38,7 +38,7 @@ from lib.tests import (
|
||||
get_environment_overlay,
|
||||
change_env,
|
||||
)
|
||||
-from lib.tempfile import TemporaryDirectory
|
||||
+from tempfile import TemporaryDirectory
|
||||
|
||||
|
||||
def which(name):
|
||||
diff --git a/js/src/tests/jstests.py b/js/src/tests/jstests.py
|
||||
index 6fa2f5f..53ceff6 100755
|
||||
--- a/js/src/tests/jstests.py
|
||||
+++ b/js/src/tests/jstests.py
|
||||
@@ -37,7 +37,7 @@ from lib.tests import (
|
||||
from lib.results import ResultsSink, TestOutput
|
||||
from lib.progressbar import ProgressBar
|
||||
from lib.adaptor import xdr_annotate
|
||||
-from lib.tempfile import TemporaryDirectory
|
||||
+from tempfile import TemporaryDirectory
|
||||
|
||||
if sys.platform.startswith("linux") or sys.platform.startswith("darwin"):
|
||||
from lib.tasks_unix import run_all_tests
|
||||
diff --git a/js/src/tests/lib/tempfile.py b/js/src/tests/lib/tempfile.py
|
||||
index ecc21c9..f0a1fa3 100644
|
||||
--- a/js/src/tests/lib/tempfile.py
|
||||
+++ b/js/src/tests/lib/tempfile.py
|
||||
@@ -2,19 +2,4 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
from __future__ import absolute_import
|
||||
-
|
||||
-try:
|
||||
- # Python 3.2
|
||||
- from tempfile import TemporaryDirectory
|
||||
-except ImportError:
|
||||
- import tempfile
|
||||
- import shutil
|
||||
- from contextlib import contextmanager
|
||||
-
|
||||
- @contextmanager
|
||||
- def TemporaryDirectory(*args, **kwds):
|
||||
- d = tempfile.mkdtemp(*args, **kwds)
|
||||
- try:
|
||||
- yield d
|
||||
- finally:
|
||||
- shutil.rmtree(d)
|
||||
+from tempfile import TemporaryDirectory
|
||||
--
|
||||
2.31.1
|
||||
|
||||
26
tests-increase-timeout.patch
Normal file
26
tests-increase-timeout.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 9be85b155c6df0454c5faef9e850f572c99e3615 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
|
||||
Date: Wed, 15 Jul 2020 08:32:44 +0200
|
||||
Subject: [PATCH] Increase the test timeout for slower buildds
|
||||
|
||||
Ported forward from Debian: https://bugs.debian.org/878284
|
||||
---
|
||||
js/src/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
|
||||
index 6daed72..16db2de 100644
|
||||
--- a/js/src/Makefile.in
|
||||
+++ b/js/src/Makefile.in
|
||||
@@ -53,7 +53,7 @@ check:: check-js-msg
|
||||
|
||||
check-jstests:
|
||||
$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON3) -u $(srcdir)/tests/jstests.py \
|
||||
- --no-progress --format=automation --timeout 300 \
|
||||
+ --no-progress --format=automation --timeout 600 \
|
||||
$(JSTESTS_EXTRA_ARGS) \
|
||||
$(DIST)/bin/js$(BIN_SUFFIX)
|
||||
|
||||
--
|
||||
2.37.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user