From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../config/mozconfigs/linux64/asan-fuzzing-ccov | 33 ++-------------------- browser/config/mozconfigs/win32/common-win32 | 2 +- browser/config/mozconfigs/win32/mingwclang | 2 +- .../config/mozconfigs/win64-aarch64/common-win64 | 2 +- browser/config/mozconfigs/win64/common-win64 | 2 +- browser/config/mozconfigs/win64/mingwclang | 2 +- browser/config/mozconfigs/win64/plain-opt | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- 9 files changed, 11 insertions(+), 38 deletions(-) (limited to 'browser/config') diff --git a/browser/config/mozconfigs/linux64/asan-fuzzing-ccov b/browser/config/mozconfigs/linux64/asan-fuzzing-ccov index d074a98c55..fd25b71a79 100644 --- a/browser/config/mozconfigs/linux64/asan-fuzzing-ccov +++ b/browser/config/mozconfigs/linux64/asan-fuzzing-ccov @@ -1,32 +1,5 @@ -# We still need to build with debug symbols -ac_add_options --disable-debug -ac_add_options --enable-optimize="-O2 -gline-tables-only" - -#add-on signing is checked but not enforced -MOZ_REQUIRE_SIGNING= - -# ASan specific options on Linux -ac_add_options --enable-valgrind - -. $topsrcdir/build/unix/mozconfig.asan - -ac_add_options --disable-sandbox -ac_add_options --disable-profiling -ac_add_options --disable-warnings-as-errors -ac_add_options --enable-coverage - -export CFLAGS="$CFLAGS --coverage" -export CXXFLAGS="$CXXFLAGS --coverage" -export LDFLAGS="$LDFLAGS --coverage -Wl,--compress-debug-sections=zlib" - -ac_add_options --enable-fuzzing -unset MOZ_STDCXX_COMPAT - -# Package js shell. -export MOZ_PACKAGE_JSSHELL=1 +. "$topsrcdir/browser/config/mozconfigs/linux64/code-coverage" +. "$topsrcdir/browser/config/mozconfigs/linux64/nightly-fuzzing-asan" # Need this to prevent name conflicts with the normal nightly build packages -export MOZ_PKG_SPECIAL=asan-ccov - -. "$topsrcdir/build/mozconfig.common.override" - +export MOZ_PKG_SPECIAL=asan-ccov \ No newline at end of file diff --git a/browser/config/mozconfigs/win32/common-win32 b/browser/config/mozconfigs/win32/common-win32 index bf75594aed..baa1958bf2 100644 --- a/browser/config/mozconfigs/win32/common-win32 +++ b/browser/config/mozconfigs/win32/common-win32 @@ -2,7 +2,7 @@ ac_add_options --target=i686-pc-windows-msvc -. $topsrcdir/build/win32/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl if test `uname -s` = Linux; then diff --git a/browser/config/mozconfigs/win32/mingwclang b/browser/config/mozconfigs/win32/mingwclang index 00f74618f4..befca5d114 100644 --- a/browser/config/mozconfigs/win32/mingwclang +++ b/browser/config/mozconfigs/win32/mingwclang @@ -32,7 +32,7 @@ ac_add_options --enable-disk-remnant-avoidance ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-geckodriver # Bug 1489320 ac_add_options --disable-update-agent # Bug 1561797 -ac_add_options --disable-default-browser-agent # WinToast does not build on mingw +ac_add_options --disable-default-browser-agent # Relies on toast notifications which don't build on mingw. ac_add_options --disable-notification-server # Toast notifications don't build on mingw. # Find our toolchain diff --git a/browser/config/mozconfigs/win64-aarch64/common-win64 b/browser/config/mozconfigs/win64-aarch64/common-win64 index fdb2a5886c..6f09d193e4 100644 --- a/browser/config/mozconfigs/win64-aarch64/common-win64 +++ b/browser/config/mozconfigs/win64-aarch64/common-win64 @@ -2,7 +2,7 @@ ac_add_options --target=aarch64-pc-windows-msvc -. $topsrcdir/build/win64-aarch64/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl if test `uname -s` = Linux; then diff --git a/browser/config/mozconfigs/win64/common-win64 b/browser/config/mozconfigs/win64/common-win64 index 3a61c84141..e03d6c28b9 100644 --- a/browser/config/mozconfigs/win64/common-win64 +++ b/browser/config/mozconfigs/win64/common-win64 @@ -2,7 +2,7 @@ ac_add_options --target=x86_64-pc-windows-msvc -. $topsrcdir/build/win64/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl if test `uname -s` = Linux; then diff --git a/browser/config/mozconfigs/win64/mingwclang b/browser/config/mozconfigs/win64/mingwclang index d80e4a7654..a99f6f5be0 100644 --- a/browser/config/mozconfigs/win64/mingwclang +++ b/browser/config/mozconfigs/win64/mingwclang @@ -32,7 +32,7 @@ ac_add_options --enable-disk-remnant-avoidance ac_add_options --disable-webrtc # Bug 1393901 ac_add_options --disable-geckodriver # Bug 1489320 ac_add_options --disable-update-agent # Bug 1561797 -ac_add_options --disable-default-browser-agent # WinToast does not build on mingw +ac_add_options --disable-default-browser-agent # Relies on toast notifications which don't build on mingw. ac_add_options --disable-notification-server # Toast notifications don't build on mingw. # Find our toolchain diff --git a/browser/config/mozconfigs/win64/plain-opt b/browser/config/mozconfigs/win64/plain-opt index f0eac8a02a..0e17d6da59 100644 --- a/browser/config/mozconfigs/win64/plain-opt +++ b/browser/config/mozconfigs/win64/plain-opt @@ -1,4 +1,4 @@ ac_add_options --disable-release ac_add_options --target=x86_64-pc-windows-msvc -. $topsrcdir/build/win64/mozconfig.vs-latest +. $topsrcdir/build/mozconfig.clang-cl diff --git a/browser/config/version.txt b/browser/config/version.txt index 2c7399bd34..f88f4e2aa4 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -124.0.1 +125.0.1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index 2c7399bd34..f88f4e2aa4 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -124.0.1 +125.0.1 -- cgit v1.2.3