Skip to contentSkip to conversation

chromium: remove more Werror flags

PATCH New Trevor Woerner 1 participant 2 messages Mar 15, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 chromium: remove more Werror flags

---
 .../chromium/chromium/chromium/remove-Werror.patch | 51 ++++++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)
recipes-browser/chromium/chromium/chromium/remove-Werror.patch +47 -4
index e69b643..f279d92 100644
@@ -1,5 +1,3 @@
-Index: chromium-53.0.2774.4/build/common.gypi
-===================================================================
 --- chromium-53.0.2774.4.orig/build/common.gypi
 +++ chromium-53.0.2774.4/build/common.gypi
 @@ -1446,7 +1446,7 @@
@@ -46,8 +44,6 @@ Index: chromium-53.0.2774.4/build/common.gypi
            'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
            'USE_HEADERMAP': 'NO',
            'WARNING_CFLAGS': [
-Index: chromium-53.0.2774.4/build/config/compiler/BUILD.gn
-===================================================================
 --- chromium-53.0.2774.4.orig/build/config/compiler/BUILD.gn
 +++ chromium-53.0.2774.4/build/config/compiler/BUILD.gn
 @@ -1040,9 +1040,6 @@ config("chromium_code") {
@@ -72,3 +68,50 @@ Index: chromium-53.0.2774.4/build/config/compiler/BUILD.gn
      if (is_clang && !is_nacl) {
        # TODO(thakis): Remove !is_nacl once
        # https://codereview.webrtc.org/1552863002/ made its way into chromium.
+diff -ur chromium-52.0.2743.76__ORIG/v8/gypfiles/standalone.gypi chromium-52.0.2743.76/v8/gypfiles/standalone.gypi
+--- chromium-52.0.2743.76__ORIG/v8/gypfiles/standalone.gypi	2016-07-15 18:04:19.000000000 -0400
++++ chromium-52.0.2743.76/v8/gypfiles/standalone.gypi	2017-03-13 16:04:16.587323380 -0400
+@@ -147,7 +147,6 @@
+     'host_clang%': '<(host_clang)',
+     'target_arch%': '<(target_arch)',
+     'v8_target_arch%': '<(v8_target_arch)',
+-    'werror%': '-Werror',
+     'use_goma%': '<(use_goma)',
+     'gomadir%': '<(gomadir)',
+     'asan%': '<(asan)',
+@@ -499,7 +498,6 @@
+             'cflags!': [
+               '-pedantic',
+               '-Wall',
+-              '-Werror',
+               '-Wextra',
+               '-Wshorten-64-to-32',
+             ],
+@@ -705,7 +703,6 @@
+       'target_defaults': {
+         'cflags': [
+           '-Wall',
+-          '<(werror)',
+           '-Wno-unused-parameter',
+           '-Wno-long-long',
+           '-pthread',
+@@ -757,7 +754,6 @@
+       'target_defaults': {
+         'cflags': [
+           '-Wall',
+-          '<(werror)',
+           '-Wno-unused-parameter',
+           # Don't warn about the "struct foo f = {0};" initialization pattern.
+           '-Wno-missing-field-initializers',
+diff -ur chromium-52.0.2743.76__ORIG/v8/gypfiles/toolchain.gypi chromium-52.0.2743.76/v8/gypfiles/toolchain.gypi
+--- chromium-52.0.2743.76__ORIG/v8/gypfiles/toolchain.gypi	2016-07-15 18:04:19.000000000 -0400
++++ chromium-52.0.2743.76/v8/gypfiles/toolchain.gypi	2017-03-13 16:03:29.851181458 -0400
+@@ -82,7 +82,7 @@
+     'v8_toolset_for_shell%': 'target',
+ 
+     'host_os%': '<(OS)',
+-    'werror%': '-Werror',
++    'werror%': '',
+     # For a shared library build, results in "libv8-<(soname_version).so".
+     'soname_version%': '',
+ 
Signature · 1 line
2.12.0.rc1.48.g076c053
#1 lore raw

PATCH 2/2 chromium: add support for 32-bit raspberrypi

Apart from gcc complaining about conflicting -march and -mcpu flags, chromium builds and runs fine as-is on 32-bit Raspberry Pi for X11.

---
 recipes-browser/chromium/chromium.inc                   |  1 +
 recipes-browser/chromium/files/armv7ve/include.gypi     |  9 +++++++++
 recipes-browser/chromium/files/armv7ve/oe-defaults.gypi | 15 +++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 recipes-browser/chromium/files/armv7ve/include.gypi
 create mode 100644 recipes-browser/chromium/files/armv7ve/oe-defaults.gypi
recipes-browser/chromium/chromium.inc +1 -0
index e603af0..60edccb 100644
@@ -6,6 +6,7 @@ COMPATIBLE_MACHINE_x86 = "(.*)"
 COMPATIBLE_MACHINE_x86-64 = "(.*)"
 COMPATIBLE_MACHINE_armv6 = "(.*)"
 COMPATIBLE_MACHINE_armv7a = "(.*)"
+COMPATIBLE_MACHINE_armv7ve = "(.*)"
 
 # The build type defaults to Release. If you want a Debug build, you can set
 # the variable CHROMIUM_BUILD_TYPE to "Debug" in your conf/local.conf file.
recipes-browser/chromium/files/armv7ve/include.gypi new file +9 -0
new file mode 100644
index 0000000..316cf48
@@ -0,0 +1,9 @@
+{
+  'variables': {
+    # Configure for armv7 compilation
+    'target_arch': 'arm',
+    'armv7': 1,
+    'arm_thumb': 1,
+    'arm_neon': 1,
+  }, 
+}
recipes-browser/chromium/files/armv7ve/oe-defaults.gypi new file +15 -0
new file mode 100644
index 0000000..27e1cfe
@@ -0,0 +1,15 @@
+{
+  'variables': {
+    'use_system_bzip2': 1,
+    'disable_nacl': 1,
+    'proprietary_codecs': 1,
+    'v8_use_snapshot': 1,
+    'use_system_ffmpeg': 0,
+    'linux_use_tcmalloc': 0,
+    'linux_link_kerberos': 0,
+    'use_kerberos': 0,
+    'use_cups': 0,
+    'use_gnome_keyring': 0,
+    'linux_link_gnome_keyring': 0
+  }, 
+}
Signature · 1 line
2.12.0.rc1.48.g076c053