summaryrefslogtreecommitdiffstats
path: root/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch')
-rw-r--r--patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch28
1 files changed, 0 insertions, 28 deletions
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
deleted file mode 100644
index d3680ac3a..000000000
--- a/patches/chromium/tools/gyp/0001-Fix-build-with-toplevel-dir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Pierre Rossi <pierre.rossi@digia.com>
-Date: Mon, 13 May 2013 16:25:46 +0200
-Subject: Fix build with toplevel-dir
-
----
- 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 a40c7fe..a169234 100644
---- a/pylib/gyp/generator/ninja.py
-+++ b/pylib/gyp/generator/ninja.py
-@@ -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'))
-+ # Take into account the fact that toplevel_dir might not be equal to depth
-+ toplevel_offset = ''
-+ if 'options' in params:
-+ options = params['options']
-+ 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 ComputeOutputDir(params):
- """Returns the path from the toplevel_dir to the build output directory."""