diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2011-09-27 17:43:40 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2011-09-27 17:43:40 +0000 |
| commit | 9cd088eb241413197443d490bb440fd6d982c37e (patch) | |
| tree | 32ba71558492c7c5de7969d2d7a20dcd5839c8c8 /www/chromium/files | |
| parent | 5c83b02da65cbfa33523f7ca3e636cdb1214b40a (diff) | |
- Enable building Chromium with v8 from Ports installed.
- Minor cleanups.
Submitted by: George Liaskos
Notes
Notes:
svn path=/head/; revision=282502
Diffstat (limited to 'www/chromium/files')
3 files changed, 29 insertions, 11 deletions
diff --git a/www/chromium/files/patch-base__allocator__allocator.gyp b/www/chromium/files/patch-base__allocator__allocator.gyp index d823d81f65ed..13eeccbe079f 100644 --- a/www/chromium/files/patch-base__allocator__allocator.gyp +++ b/www/chromium/files/patch-base__allocator__allocator.gyp @@ -1,5 +1,5 @@ ---- base/allocator/allocator.gyp.orig 2011-09-16 17:00:33.000000000 +0300 -+++ base/allocator/allocator.gyp 2011-09-16 17:03:48.000000000 +0300 +--- base/allocator/allocator.gyp.orig 2011-09-14 11:01:29.000000000 +0300 ++++ base/allocator/allocator.gyp 2011-09-25 22:56:07.000000000 +0300 @@ -7,324 +7,196 @@ 'jemalloc_dir': '../../third_party/jemalloc/chromium', 'tcmalloc_dir': '../../third_party/tcmalloc/chromium', @@ -43,10 +43,10 @@ + }, + 'link_settings': { + 'ldflags': [ -+ '<!@(pkg-config libtcmalloc --libs-only-l)', ++ '<!@(pkg-config libtcmalloc --libs-only-L)', + ], + 'libraries': [ -+ '<!@(pkg-config libtcmalloc --libs-only-L)', ++ '<!@(pkg-config libtcmalloc --libs-only-l)', ], - }], - ], diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi index 2ac944f4ff02..41ab1a6b9d30 100644 --- a/www/chromium/files/patch-build__common.gypi +++ b/www/chromium/files/patch-build__common.gypi @@ -1,5 +1,5 @@ ---- build/common.gypi.orig 2011-09-12 11:35:33.000000000 +0300 -+++ build/common.gypi 2011-09-16 19:05:37.000000000 +0300 +--- build/common.gypi.orig 2011-09-14 11:01:28.000000000 +0300 ++++ build/common.gypi 2011-09-20 23:07:03.727643942 +0300 @@ -303,6 +303,10 @@ 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', @@ -29,7 +29,7 @@ 'sources/': [ ['exclude', '_linux(_unittest)?\\.(h|cc)$'], ['exclude', '(^|/)linux/'], -@@ -1536,6 +1540,15 @@ +@@ -1536,6 +1540,19 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], @@ -39,8 +39,12 @@ + 'libraries!': [ + '-ldl', + ], -+ 'cflags!': [ -+ '-fno-signed-zeros', ++ 'conditions': [ ++ ['gcc_version == 42', { ++ 'cflags!': [ ++ '-fno-signed-zeros', ++ ], ++ }], + ], }, }], diff --git a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp b/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp index 2e1070fc3adb..d729fe70fdac 100644 --- a/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp +++ b/www/chromium/files/patch-v8__src__extensions__experimental__experimental.gyp @@ -1,5 +1,5 @@ ---- v8/src/extensions/experimental/experimental.gyp.orig 2011-09-11 19:05:30.000000000 +0300 -+++ v8/src/extensions/experimental/experimental.gyp 2011-09-11 19:05:46.000000000 +0300 +--- v8/src/extensions/experimental/experimental.gyp.orig 2011-09-14 11:19:51.000000000 +0300 ++++ v8/src/extensions/experimental/experimental.gyp 2011-09-26 02:10:36.000000000 +0300 @@ -56,8 +56,14 @@ 'number-format.h', '<(SHARED_INTERMEDIATE_DIR)/i18n-js.cc', @@ -16,3 +16,17 @@ # v8/ is root for all includes. '../../..' ], +@@ -71,6 +77,13 @@ + 'include_dirs': [ + '../../..' + ], ++ 'conditions': [ ++ ['OS == "freebsd"', { ++ 'include_dirs!': [ ++ '<(prefix_dir)/include', ++ ], ++ }], ++ ], + }, + }, + { |