diff options
Diffstat (limited to 'patches/chromium/tools')
4 files changed, 15 insertions, 17 deletions
diff --git a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch index 3a703b8ac..67188c051 100644 --- a/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch +++ b/patches/chromium/tools/grit/0001-GRIT-Allow-grd-files-outside-of-chromium-source-dir.patch @@ -14,23 +14,22 @@ file in chromium > file basename > absolute file name. THIS SHOULD BE UPSTREAMABLE. --- - grit/node/misc.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + grit/node/misc.py | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/grit/node/misc.py b/grit/node/misc.py -index 734c57a..33848b2 100755 +index 345081f..3daf89c 100755 --- a/grit/node/misc.py +++ b/grit/node/misc.py -@@ -49,7 +49,7 @@ def _ReadFirstIdsFromFile(filename, defines): +@@ -49,6 +49,7 @@ def _ReadFirstIdsFromFile(filename, defines): def ReplaceVariable(matchobj): for key, value in defines.iteritems(): if matchobj.group(1) == key: -- value = os.path.abspath(value)[len(src_root_dir) + 1:] + value = os.path.abspath(value) return value return '' -@@ -427,6 +427,11 @@ class GritNode(base.Node): +@@ -431,6 +432,11 @@ class GritNode(base.Node): abs_filename = os.path.abspath(filename_or_stream) if abs_filename[:len(src_root_dir)] != src_root_dir: filename = os.path.basename(filename_or_stream) diff --git a/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch b/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch index 0ab2861ee..d3680ac3a 100644 --- a/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch +++ b/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch @@ -4,14 +4,14 @@ Date: Mon, 13 May 2013 16:25:46 +0200 Subject: Fix build with toplevel-dir --- - pylib/gyp/generator/ninja.py | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + pylib/gyp/generator/ninja.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py -index 9011807..6fe07c5 100644 +index a40c7fe..a169234 100644 --- a/pylib/gyp/generator/ninja.py +++ b/pylib/gyp/generator/ninja.py -@@ -1476,9 +1476,13 @@ def CalculateVariables(default_variables, params): +@@ -1473,8 +1473,13 @@ def CalculateVariables(default_variables, params): default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') default_variables.setdefault('SHARED_LIB_DIR', os.path.join('$!PRODUCT_DIR', 'lib')) @@ -22,8 +22,7 @@ index 9011807..6fe07c5 100644 + toplevel_offset = os.path.relpath(options.depth, options.toplevel_dir) default_variables.setdefault('LIB_DIR', - os.path.join('$!PRODUCT_DIR', 'obj')) -- + os.path.join('$!PRODUCT_DIR', 'obj', toplevel_offset)) - def OpenOutput(path, mode='w'): - """Open |path| for writing, creating directories if necessary.""" + def ComputeOutputDir(params): + """Returns the path from the toplevel_dir to the build output directory.""" diff --git a/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch index d12bad22b..b4a39a42f 100644 --- a/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch +++ b/patches/chromium/tools/gyp/0002-Add-support-for-libc-to-xcode_emulation.py.patch @@ -8,10 +8,10 @@ Subject: Add support for libc++ to xcode_emulation.py 1 file changed, 3 insertions(+) diff --git a/pylib/gyp/xcode_emulation.py b/pylib/gyp/xcode_emulation.py -index b4af0fd..fb40048 100644 +index 5e50f10..31191da 100644 --- a/pylib/gyp/xcode_emulation.py +++ b/pylib/gyp/xcode_emulation.py -@@ -580,6 +580,9 @@ class XcodeSettings(object): +@@ -609,6 +609,9 @@ class XcodeSettings(object): for ldflag in self._Settings().get('OTHER_LDFLAGS', []): ldflags.append(self._MapLinkerFlagFilename(ldflag, gyp_to_build_path)) diff --git a/patches/chromium/tools/gyp/0003-Allow-letting-qmake-do-the-link-step.patch b/patches/chromium/tools/gyp/0003-Allow-letting-qmake-do-the-link-step.patch index 8b86bd5ad..88d1a83c8 100644 --- a/patches/chromium/tools/gyp/0003-Allow-letting-qmake-do-the-link-step.patch +++ b/patches/chromium/tools/gyp/0003-Allow-letting-qmake-do-the-link-step.patch @@ -15,10 +15,10 @@ Reviewed-by: Andras Becsi <andras.becsi@digia.com> 1 file changed, 43 insertions(+) diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py -index 6fe07c5..c61f180 100644 +index a169234..909c8d8 100644 --- a/pylib/gyp/generator/ninja.py +++ b/pylib/gyp/generator/ninja.py -@@ -1090,6 +1090,49 @@ class NinjaWriter: +@@ -1101,6 +1101,49 @@ class NinjaWriter: else: command = command + '_notoc' |