Separate disabling of warnings as errors on Linux out of the volatile…

… malloc patch so it will get applied independently. Fixes build on Debian wheezy, which has an nss library that causes deprecation warnings but not a new enough glibc to require the volatile malloc patch.
sirikata · Apr 22, 2012 · f8c441a · f8c441a
1 parent 7ec111f
commit f8c441a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/patches/chromium-gcc-463-glibc-2.14.patch.volatile-malloc b/patches/chromium-gcc-463-glibc-2.14.patch.volatile-malloc
@@ -1,24 +1,3 @@
-Index: build/common.gypi
-===================================================================
---- build/common.gypi	(revision 70801)
-+++ build/common.gypi	(working copy)
-@@ -568,7 +568,6 @@
-             'cflags!': [
-               '-Wall',
-               '-Wextra',
--              '-Werror',
-             ],
-           }],
-           [ 'OS=="win"', {
-@@ -846,7 +845,7 @@
-           # there is some 4.4 test infrastructure in place and existing
-           # aliasing issues have been fixed.
-           'no_strict_aliasing%': 1,
--          'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
-+          'conditions': [['OS=="linux"', {'werror%': '',}],
-                          ['OS=="freebsd"', {'werror%': '',}],
-                          ['OS=="openbsd"', {'werror%': '',}],
-           ],
 Index: net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp
 ===================================================================
 --- net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp	(revision 70801)

diff --git a/patches/chromium-gcc-disable-warnings-as-errors.patch b/patches/chromium-gcc-disable-warnings-as-errors.patch
@@ -0,0 +1,21 @@
+Index: build/common.gypi
+===================================================================
+--- build/common.gypi	(revision 70801)
++++ build/common.gypi	(working copy)
+@@ -568,7 +568,6 @@
+             'cflags!': [
+               '-Wall',
+               '-Wextra',
+-              '-Werror',
+             ],
+           }],
+           [ 'OS=="win"', {
+@@ -846,7 +845,7 @@
+           # there is some 4.4 test infrastructure in place and existing
+           # aliasing issues have been fixed.
+           'no_strict_aliasing%': 1,
+-          'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
++          'conditions': [['OS=="linux"', {'werror%': '',}],
+                          ['OS=="freebsd"', {'werror%': '',}],
+                          ['OS=="openbsd"', {'werror%': '',}],
+           ],