brizental pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 9eeb936a by Beatriz Rizental at 2026-01-14T10:36:44-03:00 fixup! BB 44167: Don't build the uninstaller for Windows during Firefox compilation When building with tests enabled, the current patch was breaking the generated Makefile. This commit fixes it. - - - - - e664fbe8 by Beatriz Rizental at 2026-01-14T10:36:44-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser We don't want to bootstrap OONX. It's a ML tool, not used. - - - - - 7e98980e by Beatriz Rizental at 2026-01-14T10:36:45-03:00 fixup! BB 43564: Modify ./mach bootstrap for Base Browser Use our MacOS SDK mirror when bootstrapping for Mac. - - - - - 3 changed files: - browser/Makefile.in - build/moz.configure/bootstrap.configure - toolkit/moz.configure Changes: ===================================== browser/Makefile.in ===================================== @@ -7,6 +7,7 @@ include $(topsrcdir)/config/rules.mk ifdef MAKENSISU ifdef ENABLE_TESTS +libs:: $(MAKE) -C installer/windows install_deps endif #ENABLE_TESTS ===================================== build/moz.configure/bootstrap.configure ===================================== @@ -165,6 +165,7 @@ def bootstrap_path(path, **kwargs): when=when, ) @imports("os") + @imports("re") @imports("subprocess") @imports("sys") @imports("mozbuild.tbbutils") @@ -356,6 +357,23 @@ def bootstrap_path(path, **kwargs): + command["arguments"] + [path_parts[0]] ) + + # BIG HACK: Replace the Apple CDN link with our mirror, + # otherwise bootstrapping will fail whenever a new MacOS SDK + # is released, since Apple seems to retire the previous link everytime. + # Our mirror serves an _unmodified_ version of the file. + macosx_sdk_match = re.match(r"^MacOSX(.*)\.sdk$", path_parts[0]) + if macosx_sdk_match: + version = macosx_sdk_match.group(1) + command = [ + re.sub( + r"https://swcdn\.apple\.com/.*/CLTools_macOSNMOS_SDK\.pkg", + f"https://build-sources.tbb.torproject.org/CLTools_macOSNMOS_SDK-{version}.pkg", + c, + ) + for c in command + ] + # Clean up anything that was bootstrapped previously before going # forward. In other cases, that's taken care of by mach artifact toolchain. rmtree( ===================================== toolkit/moz.configure ===================================== @@ -4241,9 +4241,8 @@ with only_when(~artifact_builds): @depends("--with-onnx-runtime") def need_boostrap_onnxruntime(with_onnx_runtime): - return (with_onnx_runtime and len(with_onnx_runtime) == 0) or ( - with_onnx_runtime.origin == "default" - ) + # tor-browser#44412: Prevent ONNX from ever getting bootstrapped. + return False @depends( "--with-onnx-runtime", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1b6143... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1b6143... You're receiving this email because of your account on gitlab.torproject.org.