a8a65d0951
This is currently the latest version in the v16.x branch. Patch 0001-add-qemu-wrapper-support.patch needs some minor adaptations to resolve conflicts with other unrelated upstream changes. The other patches are simply refreshed. The license file is updates due to: - Reformatting changes - Addition of the mention of some files being under GPLv3, but it's only the autoconf machinery: aclocal.m4 and config.guess, so it's not relevant to add in our LICENSE variable. - Addition of the mention of another file being under the MIT license (install-sh), and MIT is already listed, and this file is anyway only part of the autoconf machinery. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From af47d317e5ae12978c1cdc40627008ada144f98b Mon Sep 17 00:00:00 2001
|
|
From: Min RK <benjaminrk@gmail.com>
|
|
Date: Fri, 19 Feb 2021 11:57:04 +0100
|
|
Subject: [PATCH] include obj name in shared intermediate
|
|
|
|
avoids duplicate ninja rules for v8 used in host and target
|
|
|
|
From: https://github.com/minrk/node/commit/5e533cb943eef68b270f55f0cba02c0ec67c699d
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
---
|
|
tools/gyp/pylib/gyp/generator/ninja.py | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tools/gyp/pylib/gyp/generator/ninja.py b/tools/gyp/pylib/gyp/generator/ninja.py
|
|
index 3db3771ac9..2e0a021703 100644
|
|
--- a/tools/gyp/pylib/gyp/generator/ninja.py
|
|
+++ b/tools/gyp/pylib/gyp/generator/ninja.py
|
|
@@ -42,7 +42,7 @@ generator_default_variables = {
|
|
# the start of a string, while $| is used for variables that can appear
|
|
# anywhere in a string.
|
|
"INTERMEDIATE_DIR": "$!INTERMEDIATE_DIR",
|
|
- "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/gen",
|
|
+ "SHARED_INTERMEDIATE_DIR": "$!PRODUCT_DIR/$|OBJ/gen",
|
|
"PRODUCT_DIR": "$!PRODUCT_DIR",
|
|
"CONFIGURATION_NAME": "$|CONFIGURATION_NAME",
|
|
# Special variables that may be used by gyp 'rule' targets.
|
|
@@ -285,6 +285,12 @@ class NinjaWriter:
|
|
CONFIGURATION_NAME = "$|CONFIGURATION_NAME"
|
|
path = path.replace(CONFIGURATION_NAME, self.config_name)
|
|
|
|
+ obj = "obj"
|
|
+ if self.toolset != "target":
|
|
+ obj += "." + self.toolset
|
|
+
|
|
+ path = path.replace("$|OBJ", obj)
|
|
+
|
|
return path
|
|
|
|
def ExpandRuleVariables(self, path, root, dirname, source, ext, name):
|
|
--
|
|
2.37.3
|
|
|