diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2024-05-15 04:01:11 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2024-05-15 04:11:11 +0000 |
| commit | a80c93491deebb797e3f8e520bb64155730339a3 (patch) | |
| tree | 84ad39159e44c9aac2f7792ffd1f6f3cda16c06b | |
| parent | 4da1e7401561ac8d28da1837b0e5937788f8f099 (diff) | |
| download | ports-a80c93491deebb797e3f8e520bb64155730339a3.tar.gz ports-a80c93491deebb797e3f8e520bb64155730339a3.zip | |
devel/electron27: Fix build with ninja 1.12.0
Fix race conditions where generated headers are not created before they
are needed in the build.
Ninja 1.12.0 removed the `-w dupbuild` option and the default behavior
is now equivalent to passing `-w dupbuild=err` in previous versions.
PR: 278693
Approved by: portmgr (blanket)
| -rw-r--r-- | devel/electron27/files/patch-net_dns_BUILD.gn | 16 | ||||
| -rw-r--r-- | devel/electron27/files/patch-tools_gn_bootstrap_bootstrap.py | 11 |
2 files changed, 24 insertions, 3 deletions
diff --git a/devel/electron27/files/patch-net_dns_BUILD.gn b/devel/electron27/files/patch-net_dns_BUILD.gn index ace61b87cb0b..5af7d7ae118c 100644 --- a/devel/electron27/files/patch-net_dns_BUILD.gn +++ b/devel/electron27/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2023-08-20 00:00:07 UTC +--- net/dns/BUILD.gn.orig 2024-05-15 03:41:02 UTC +++ net/dns/BUILD.gn @@ -128,7 +128,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -169,6 +169,7 @@ source_set("dns") { +@@ -162,6 +162,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -169,6 +172,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -436,9 +437,9 @@ source_set("tests") { +@@ -436,9 +440,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron27/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron27/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..27e31c1a49ef --- /dev/null +++ b/devel/electron27/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2023-11-01 19:30:06 UTC ++++ 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) |