svn commit: r352849 - head/www/chromium/files

[Rene Ladan]

Author: rene
Date: Fri May  2 21:21:33 2014
New Revision: 352849
URL: http://svnweb.freebsd.org/changeset/ports/352849
QAT: https://qat.redports.org/buildarchive/r352849/

Log:
  Fix build when depot_tools is not present locally (which is usually the
  case on non-development machines).
  
  PR:		ports/189230
  Submitted by:	Jia-Shiun Li <jiashiun at gmail.com>
  Obtained from:	https://codereview.chromium.org/171513010/
  Tested by:	gjb
  MFH:		2014Q2

Modified:
  head/www/chromium/files/patch-build__gyp_chromium

Modified: head/www/chromium/files/patch-build__gyp_chromium
==============================================================================
--- head/www/chromium/files/patch-build__gyp_chromium	Fri May  2 20:20:07 2014	(r352848)
+++ head/www/chromium/files/patch-build__gyp_chromium	Fri May  2 21:21:33 2014	(r352849)
@@ -1,5 +1,30 @@
 --- ./build/gyp_chromium.orig	2014-04-24 22:36:09.000000000 +0200
 +++ ./build/gyp_chromium	2014-04-24 23:23:42.000000000 +0200
+@@ -39,8 +39,6 @@
+ sys.path.insert(1, os.path.join(chrome_src, 'third_party', 'WebKit',
+     'Source', 'build', 'scripts'))
+ 
+-import find_depot_tools
+-
+ # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
+ # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
+ # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
+@@ -376,6 +374,7 @@
+   # TODO(bradnelson): take this out once this issue is fixed:
+   #    http://code.google.com/p/gyp/issues/detail?id=177
+   if sys.platform == 'cygwin':
++    import find_depot_tools
+     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
+     python_dir = sorted(glob.glob(os.path.join(depot_tools_path,
+                                                'python2*_bin')))[-1]
+@@ -441,6 +440,7 @@
+   # don't use the automatic toolchain, as it currently only supports VS2013.
+   msvs_version = os.environ.get('GYP_MSVS_VERSION', '2013')
+   if sys.platform in ('win32', 'cygwin') and msvs_version.startswith('2013'):
++    import find_depot_tools
+     depot_tools_path = find_depot_tools.add_depot_tools_to_path()
+     toolchain = os.path.normpath(os.path.join(
+         depot_tools_path, 'win_toolchain', 'vs2013_files'))
 @@ -477,8 +477,9 @@
      args.append('--check')