diff options
| author | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-01 14:01:07 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-08-08 15:52:03 +0200 |
| commit | ba59428a57b9ba05d03673d4d498eedc0b14c478 (patch) | |
| tree | 744072da200b0ac6a0582250c91cd3149d70f621 /patches | |
| parent | 899c5dbbd4042bf98c135da8efd4a31f53777fb4 (diff) | |
Add patch for newer XCode/clang versions on Mac.
Remove -Wno-deprecated-register from common.gypi.
This warning is not supported by recent clang versions
shipping with XCode. Therefore replacing it with -Wno-deprecated.
This is a bit a too broad fix, but the best we can do for now.
It seems that the flag is still supported in upstream clang.
Change-Id: I609355484c9b3ae111591a17181f02104bed6b6b
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch | 38 | ||||
| -rwxr-xr-x | patches/patch-chromium.sh | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch b/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch new file mode 100644 index 000000000..90dbe8da0 --- /dev/null +++ b/patches/0001-remove-Wno-deprecated-register-from-common.gypi.patch @@ -0,0 +1,38 @@ +From 06b7d7b85c53a6c5b39eff247dd5ce869956f411 Mon Sep 17 00:00:00 2001 +From: Zeno Albisser <zeno.albisser@digia.com> +Date: Thu, 1 Aug 2013 14:03:14 +0200 +Subject: [PATCH] remove -Wno-deprecated-register from common.gypi. + +This warning is not supported by recent clang versions +shipping with XCode. Therefore replacing it with -Wno-deprecated. +This is a bit a too broad fix, but the best we can do for now. +It seems that the flag is still supported in upstream clang. +--- + build/common.gypi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/common.gypi b/build/common.gypi +index 07abb6a..19ef09c 100644 +--- a/build/common.gypi ++++ b/build/common.gypi +@@ -3166,7 +3166,7 @@ + # Clang considers the `register` keyword as deprecated, but e.g. + # code generated by flex (used in angle) contains that keyword. + # http://crbug.com/255186 +- '-Wno-deprecated-register', ++ '-Wno-deprecated', + ], + 'cflags!': [ + # Clang doesn't seem to know know this flag. +@@ -3877,7 +3877,7 @@ + # Clang considers the `register` keyword as deprecated, but e.g. + # code generated by flex (used in angle) contains that keyword. + # http://crbug.com/255186 +- '-Wno-deprecated-register', ++ '-Wno-deprecated', + ], + 'OTHER_CPLUSPLUSFLAGS': [ + # gnu++11 instead of c++11 is needed because some code uses +-- +1.7.12.4 (Apple Git-37) + diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index d1fc7c271..09748f032 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -64,6 +64,7 @@ git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patc git am $PATCH_DIR/0001-Mac-Do-not-modify-the-child-path.patch git am $PATCH_DIR/0001-Do-not-warn-for-header-hygiene.patch git am $PATCH_DIR/0001-Build-files-necessary-for-touch-and-gestures.patch +git am $PATCH_DIR/0001-remove-Wno-deprecated-register-from-common.gypi.patch cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" |