Commit 9ed06c36 authored by Natanael Copa's avatar Natanael Copa

community/chromium: fix build on armv7

parent 01e08233
...@@ -5,7 +5,7 @@ pkgver=72.0.3626.109 ...@@ -5,7 +5,7 @@ pkgver=72.0.3626.109
pkgrel=0 pkgrel=0
pkgdesc="chromium web browser" pkgdesc="chromium web browser"
url="http://www.chromium.org/" url="http://www.chromium.org/"
arch="x86_64" # aarch64 armhf armv7 temp disable because we need clang for arm arch="x86_64 armv7" # aarch64 temp disable due to build failure
license="BSD" license="BSD"
depends="xdg-utils" depends="xdg-utils"
depends_dev="" depends_dev=""
...@@ -106,6 +106,8 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn ...@@ -106,6 +106,8 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
musl-v8-monotonic-pthread-cont_timedwait.patch musl-v8-monotonic-pthread-cont_timedwait.patch
gcc8-alignof.patch gcc8-alignof.patch
gcc-fno-delete-null-pointer-checks.patch gcc-fno-delete-null-pointer-checks.patch
gcc-arm.patch
musl-arm-limits.patch
" "
builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
...@@ -169,6 +171,11 @@ prepare() { ...@@ -169,6 +171,11 @@ prepare() {
-delete -delete
done done
# workaround missing files for arm
for i in safe_conversions_arm_impl.h safe_math_arm_impl.h; do
ln -s ../../../../base/numerics/$i tools/gn/base/numerics/$i
done
msg "Replacing gyp files" msg "Replacing gyp files"
python build/linux/unbundle/replace_gn_files.py --system-libraries \ python build/linux/unbundle/replace_gn_files.py --system-libraries \
${use_system} ${use_system}
...@@ -344,4 +351,6 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f ...@@ -344,4 +351,6 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f
2c22e0d56b2557bafc842043911ecd0f8f70589013aeb7d3e8c7c8a5622bdbfe1f249e7223991ebf6130c7a45c7771a02dcc096dd03c48e2559ea4741147cfce musl-v8-fix-deadlock.patch 2c22e0d56b2557bafc842043911ecd0f8f70589013aeb7d3e8c7c8a5622bdbfe1f249e7223991ebf6130c7a45c7771a02dcc096dd03c48e2559ea4741147cfce musl-v8-fix-deadlock.patch
6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch 6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch
9bfc532fd1e84e30362ac41fcd68253e17ee4cb5e986ceb5bb122e3235e4617e295ce9dddfdfbbd0b9d3e67267096152da2a19e3bb4bb9111c7fdb22fa398872 gcc8-alignof.patch 9bfc532fd1e84e30362ac41fcd68253e17ee4cb5e986ceb5bb122e3235e4617e295ce9dddfdfbbd0b9d3e67267096152da2a19e3bb4bb9111c7fdb22fa398872 gcc8-alignof.patch
bb0f3dc1ade429a398d487ae190a278948533398c4a1085aeb35ff57fefb90a1e598008ba839423ca0acd30ba4c992950f395dba3b9994d3c7187fe68b9a93d7 gcc-fno-delete-null-pointer-checks.patch" bb0f3dc1ade429a398d487ae190a278948533398c4a1085aeb35ff57fefb90a1e598008ba839423ca0acd30ba4c992950f395dba3b9994d3c7187fe68b9a93d7 gcc-fno-delete-null-pointer-checks.patch
9f4a555b98ca47063fd5a90d119686de09d5c8ecdec2ef936f42cf45d3ba012e91a6455d3d550b3c90da15ca9b085238afd442a21ce47bea571ff356b74620f8 gcc-arm.patch
3bcffb36f28a01d8bb91f1c1ee1e327caebb1e139d4e8772ad15460ee69cb5ea3307a235dc83184a9e09b687882d9617f3a3ce1a7b07cbd6e11b0a5d6a6ace81 musl-arm-limits.patch"
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index b44bda6..1d159d8 100644
--- ./third_party/zlib/BUILD.gn
+++ ./third_party/zlib/BUILD.gn
@@ -63,7 +63,7 @@ config("zlib_arm_crc32_config") {
# - ChromeOS has wrapper scripts that are borking the compiler flags.
# - Fuchsia just added a syscall for feature detection.
# TODO(cavalcantii): crbug.com/810125.
- if (!is_ios && !is_chromeos && !is_fuchsia) {
+ if (is_clang && !is_ios && !is_chromeos && !is_fuchsia) {
defines = [ "CRC32_ARMV8_CRC32" ]
if (is_android) {
defines += [ "ARMV8_OS_ANDROID" ]
diff --git a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
index 6ba52a8..0c7a9f9 100644
--- ./third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
+++ ./third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc
@@ -14,6 +14,7 @@
#include "snapshot/linux/cpu_context_linux.h"
+#include <limits>
#include <stddef.h>
#include <string.h>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment