forked from OSSystems/meta-browser
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chromium: Fix gn build for Yocto master (OSSystems#808)
Build and patch changes: ------------------------ Add one backported patch to fix a build error on Yocto master. License changes: ---------------- Added licenses: none. Removed licenses: none. Updated licenses: none. Test-built: ----------- * chromium-x11: - master, clang, MACHINE=qemuarm Signed-off-by: Max Ihlenfeldt <max@igalia.com>
- Loading branch information
1 parent
d3a5f63
commit ab76411
Showing
2 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...um/recipes-browser/chromium/gn/gn-bootstrap-Don-t-pass-removed-dupbuild-ninja-optio.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From 3fbc984a8c73cb8245ea0c3783cb88c558996f7d Mon Sep 17 00:00:00 2001 | ||
From: Max Ihlenfeldt <max@igalia.com> | ||
Date: Tue, 7 May 2024 17:38:25 +0200 | ||
Subject: [PATCH] Backport "gn bootstrap: Don't pass removed dupbuild ninja option" | ||
|
||
This backports a patch to GN's bootstrap script to fix a build error | ||
when using ninja >= 1.12.0. It will be included in upstream's 126 | ||
release. | ||
|
||
Upstream-Status: Backport [https://crrev.com/c/5522398] | ||
--- | ||
tools/gn/bootstrap/bootstrap.py | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py | ||
index caf736b28946d..b721e79a205ed 100755 | ||
--- a/tools/gn/bootstrap/bootstrap.py | ||
+++ b/tools/gn/bootstrap/bootstrap.py | ||
@@ -122,7 +122,7 @@ def main(argv): | ||
|
||
shutil.copy2( | ||
os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) | ||
- cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] | ||
+ cmd = [ninja_binary, '-C', gn_build_dir, 'gn'] | ||
if options.jobs: | ||
cmd += ['-j', str(options.jobs)] | ||
subprocess.check_call(cmd) |