diff options
Diffstat (limited to 'www/chromium/files/patch-build__common.gypi')
| -rw-r--r-- | www/chromium/files/patch-build__common.gypi | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 94bcad570f7f..ba2473963b2e 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,15 +1,15 @@ ---- ./build/common.gypi.orig 2014-08-12 21:02:52.000000000 +0200 -+++ ./build/common.gypi 2014-08-13 09:56:56.000000000 +0200 -@@ -101,7 +101,7 @@ - # - # TODO(erg): Merge this into the previous block once compiling with - # aura safely implies including ash capabilities. -- ['OS=="linux"', { -+ ['OS=="linux" or OS=="freebsd"', { +--- ./build/common.gypi.orig 2014-08-20 21:02:29.000000000 +0200 ++++ ./build/common.gypi 2014-08-22 15:06:24.000000000 +0200 +@@ -87,7 +87,7 @@ + + 'conditions': [ + # ChromeOS and Windows use Aura and Ash. +- ['chromeos==1 or OS=="win" or OS=="linux"', { ++ ['chromeos==1 or OS=="win" or OS=="linux" or OS=="freebsd"', { + 'use_ash%': 1, 'use_aura%': 1, }], - -@@ -622,7 +622,7 @@ +@@ -645,7 +645,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -896,7 +896,7 @@ +@@ -926,7 +926,7 @@ # except when building Android WebView. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -27,17 +27,18 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1106,6 +1106,9 @@ +@@ -1153,6 +1153,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, ++ # XXX(rene) More options, keep them? + 'os_ver%': 0, + 'use_system_libjpeg%': 0, + # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -3960,6 +3963,13 @@ +@@ -4150,6 +4154,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], |