Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-23 17:42:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix building with glibc 2.33 in rosa2019.1

Browse source
This commit is contained in:
Mikhail Novosyolov 2021-02-23 02:48:46 +03:00
parent b4c80feae0
commit 6ab1f551f5
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch Normal file
View file

@ -0,0 +1,24 @@
diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
--- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500
+++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500
@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
#else
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
#endif
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
+ size_t stack_size = (std::max(SIGSTKSZ, static_cast<long>(65536)) + page_mask) & ~page_mask;
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
// Account for sanitizer instrumentation requiring additional stack space.
diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
--- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500
+++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
// the alternative stack. Ensure that the size of the alternative stack is
// large enough.
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
+ static const unsigned kSigStackSize = std::max(static_cast<long>(16384), SIGSTKSZ);
// Only set an alternative stack if there isn't already one, or if the current
// one is too small.

5
chromium-browser-stable.spec
View file

@ -149,6 +149,8 @@ Patch639: wayland-strndup.patch
# Fix sandbox code to properly handle the new way that glibc handles fstat in rosa2019.1+
# Thanks to Kevin Kofler for the fix (from Fedora)
Patch640: chromium-88.0.4324.96-fstatfix.patch
# rosa2019.1's glibc defines SIGSTKSZ as a long instead of a constant (from Fedora)
Patch641: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch
BuildRequires: bison
%if %{with clang}
@ -381,6 +383,9 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori
%patch637 -p1 -b .fcntl
%patch639 -p1
%patch640 -p1
%if %{mdvver} >= 201910
%patch641 -p1
%endif
# fatal error: 'fuzzer/FuzzedDataProvider.h' file not found
# (Available in Clang10)