Skip to content

spidermonkey@115 115.23.0 #221871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions Formula/s/spidermonkey@115.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class SpidermonkeyAT115 < Formula
desc "JavaScript-C Engine"
homepage "https://spidermonkey.dev"
url "https://archive.mozilla.org/pub/firefox/releases/115.22.0esr/source/firefox-115.22.0esr.source.tar.xz"
version "115.22.0"
sha256 "f57b6507ab1db52183df2aadb1fd81d9f0108b185226d1bac6205b7d7d3005b3"
url "https://archive.mozilla.org/pub/firefox/releases/115.23.0esr/source/firefox-115.23.0esr.source.tar.xz"
version "115.23.0"
sha256 "55d8883e7df92559ec09312cf3f5d747120027b9e4cd161aadf44c9faad91ff7"
license "MPL-2.0"

# Spidermonkey versions use the same versions as Firefox, so we simply check
@@ -55,7 +55,10 @@
end
end

# Fix to find linker on macos-15, abusing LD_PRINT_OPTIONS is not working
patch :DATA

def install

Check failure on line 61 in Formula/s/spidermonkey@115.rb

GitHub Actions / macOS 15-arm64

`brew install --verbose --formula --build-bottle spidermonkey@115` failed on macOS Sequoia (15) on Apple Silicon!

In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/frontend/SharedContext.h:25: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/Scope.h:34: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/JSFunction.h:25: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/JSScript.h:41: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/SharedImmutableStringsCache.h:22: /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/threading/ExclusiveData.h:113:29: error: reference to non-static member function must be called 113 | : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) { | ~~~~^~~~ /opt/homebrew/Library/Homebrew/shims/mac/super/clang++ -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX15.sdk -mmacosx-version-min=11.0 -stdlib=libc++ -std=gnu++17 --target=arm64-apple-darwin -o Unified_cpp_intl_components1.o -c -fvisibility=hidden -fvisibility-inlines-hidden -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DNDEBUG=1 -DTRIMMED=1 -DMOZ_HAS_MOZGLUE -I/private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/intl/components -I/private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/brew-build/intl/components -I/private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/brew-build/dist/include -I/opt/homebrew/Cellar/nspr/4.36/include/nspr -I/opt/homebrew/Cellar/icu4c@77/77.1/include -DMOZILLA_CLIENT -include /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/brew-build/js/src/js-confdefs.h -fno-sized-deallocation -fno-aligned-new -fPIC -fno-rtti -ffunction-sections -fdata-sections -fno-exceptions -fno-math-errno -pthread -pipe -gdwarf-4 -O3 -fno-omit-frame-pointer -funwind-tables -Wall -Wbitfield-enum-conversion -Wdeprecated-this-capture -Wempty-body -Wformat-type-confusion -Wignored-qualifiers -Wpointer-arith -Wshadow-field-in-constructor-modified -Wsign-compare -Wtautological-constant-in-range-compare -Wtype-limits -Wno-error=tautological-type-limit-compare -Wunreachable-code -Wunreachable-code-return -Wunused-but-set-parameter -Wno-invalid-offsetof -Wclass-varargs -Wempty-init-stmt -Wfloat-overflow-conversion -Wfloat-zero-conversion -Wloop-analysis -Wno-range-loop-analysis -Wc++2a-compat -Wenum-compare-conditional -Wenum-float-conversion -Wno-error=deprecated -Wno-error=deprecated-anon-enum-enum-conversion -Wno-error=deprecated-enum-enum-conversion -Wno-error=deprecated-pragma -Wno-error=deprecated-this-capture -Wcomma -Wimplicit-fallthrough -Wduplicate-method-arg -Wduplicate-method-match -Wmissing-method-return-type -Wobjc-signed-char-bool -Wsemicolon-before-method-body -Wsuper-class-method-mismatch -Wstring-conversion -Wno-inline-new-delete -Wno-error=deprecated-declarations -Wno-error=array-bounds -Wno-error=free-nonheap-object -Wno-error=atomic-alignment -Wno-error=deprecated-builtins -Wformat -Wformat-security -Wno-psabi -Wthread-safety -Werror=unguarded-availability-new -Wno-error=builtin-macro-redefined -Wno-unknown-warning-option -fno-strict-aliasing -ffp-contract=off -MD -MP -MF .deps/Unified_cpp_intl_components1.o.pp Unified_cpp_intl_components1.cpp intl/components/Unified_cpp_intl_components2.o In file included from Unified_cpp_js_src_debugger0.cpp:2: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/debugger/DebugScript.cpp:15: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/debugger/DebugAPI.h:10: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/GlobalObject.h:34: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/vm/JSContext.h:22: In file included from /private/tmp/spidermonkeyA115-20250504-7728-25gscb/firefox-115.23.0/js/src/jit/PcScriptC
# Workaround for ICU 76+
# Issue ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
inreplace "js/moz.configure", '"icu-i18n >= 73.1"', '"icu-i18n >= 73.1 icu-uc"'
@@ -110,3 +113,27 @@
assert_equal "hello", shell_output("#{bin}/js#{version.major} #{path}").strip
end
end

__END__
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 3f91d71..0133a67 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1783,7 +1783,16 @@ def select_linker_tmpl(host_or_target):
kind = "ld64"

elif retcode != 0:
- return None
+ # macOS 15 fallback: try `-Wl,-v` if --version failed
+ if target.kernel == "Darwin":
+ fallback_cmd = cmd_base + linker_flag + ["-Wl,-v"]
+ retcode2, stdout2, stderr2 = get_cmd_output(*fallback_cmd, env=env)
+ if retcode2 == 0 and "@(#)PROGRAM:ld" in stderr2:
+ kind = "ld64"
+ else:
+ return None
+ else:
+ return None

elif "mold" in stdout:
kind = "mold"
Loading