From owner-svn-ports-all@FreeBSD.ORG Fri May 2 21:21:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85848139; Fri, 2 May 2014 21:21:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5947C1C11; Fri, 2 May 2014 21:21:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s42LLYXj061901; Fri, 2 May 2014 21:21:34 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s42LLYx3061900; Fri, 2 May 2014 21:21:34 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201405022121.s42LLYx3061900@svn.freebsd.org> From: Rene Ladan Date: Fri, 2 May 2014 21:21:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352849 - head/www/chromium/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 May 2014 21:21:34 -0000 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 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')