mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-20 23:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SpiderMonkey to ESR 128.13

Browse Source 
Fixes #7662
This commit is contained in:
Itms
2025-08-04 17:27:45 +02:00
parent 733297a038
commit 7038d87454
20 changed files with 131 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jenkins/dockerfiles/debian-12.Dockerfile
+4 -2
View File
@@ -51,10 +51,12 @@ RUN apt-get -qqy update \
zlib1g-dev \
&& apt-get clean
# Install rust and Cargo via rustup, available in Debian12 1.63, need 1.66
# Install rust and Cargo via rustup, available in Debian12 1.63, need 1.76
ENV RUSTUP_HOME=/usr/local/rust
ENV CARGO_HOME=/usr/local/rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.66.0 -y
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.76.0 -y
# Install cbindgen for building SpiderMonkey
RUN /usr/local/rust/bin/cargo install cbindgen
ENV PATH="${RUSTUP_HOME}/bin:${PATH}"
ENV SHELL=/bin/bash
build/premake/extern_libs5.lua
+6 -6
View File
@@ -645,7 +645,7 @@ extern_lib_defs = {
compile_settings = function()
if _OPTIONS["with-system-mozjs"] then
if not _OPTIONS["android"] then
pkgconfig.add_includes_after("mozjs-115")
pkgconfig.add_includes_after("mozjs-128")
end
else
filter "Debug"
@@ -659,17 +659,17 @@ extern_lib_defs = {
link_settings = function()
if _OPTIONS["with-system-mozjs"] then
if _OPTIONS["android"] then
links { "mozjs-115" }
links { "mozjs-128" }
else
pkgconfig.add_links("mozjs-115")
pkgconfig.add_links("mozjs-128")
end
else
filter { "Debug" }
links { "mozjs115-debug" }
links { "mozjs128-debug" }
filter { "Release" }
links { "mozjs115-release" }
links { "mozjs128-release" }
filter { }
links { "mozjs115-rust" }
links { "mozjs128-rust" }
add_source_lib_paths("spidermonkey")
end
end,
build/premake/premake5.lua
+2 -2
View File
@@ -51,7 +51,7 @@ newoption { category = "Pyrogenesis", trigger = "sanitize-undefined-behaviour",
newoption { category = "Pyrogenesis", trigger = "strip-binaries", description = "Strip created binaries" }
newoption { category = "Pyrogenesis", trigger = "with-system-cxxtest", description = "Search standard paths for cxxtest, instead of using bundled copy" }
newoption { category = "Pyrogenesis", trigger = "with-lto", description = "Enable Link Time Optimization (LTO)" }
newoption { category = "Pyrogenesis", trigger = "with-system-mozjs", description = "Search standard paths for libmozjs115, instead of using bundled copy" }
newoption { category = "Pyrogenesis", trigger = "with-system-mozjs", description = "Search standard paths for libmozjs128, instead of using bundled copy" }
newoption { category = "Pyrogenesis", trigger = "with-system-nvtt", description = "Search standard paths for nvidia-texture-tools library, instead of using bundled copy" }
newoption { category = "Pyrogenesis", trigger = "with-valgrind", description = "Enable Valgrind support (non-Windows only)" }
newoption { category = "Pyrogenesis", trigger = "without-audio", description = "Disable use of OpenAL/Ogg/Vorbis APIs" }
@@ -166,7 +166,7 @@ end
-- The pc file doesn't specify the required -DDEBUG needed in that case
local mozjs_is_debug_build = false
if _OPTIONS["with-system-mozjs"] then
local _, errorCode = os.outputof(cc .. " $(pkg-config mozjs-115 --cflags) ./tests/mozdebug.c -o /dev/null")
local _, errorCode = os.outputof(cc .. " $(pkg-config mozjs-128 --cflags) ./tests/mozdebug.c -o /dev/null")
if errorCode ~= 0 then
mozjs_is_debug_build = true
end