diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2024-05-11 22:57:57 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2024-05-15 04:11:00 +0000 |
| commit | 4da1e7401561ac8d28da1837b0e5937788f8f099 (patch) | |
| tree | b3b3c5c78f3df24f79b1b7d78b7738a9c5fd1868 | |
| parent | 69ce5e29a540b5550a269d18651fdea2b7c79eda (diff) | |
| download | ports-4da1e7401561ac8d28da1837b0e5937788f8f099.tar.gz ports-4da1e7401561ac8d28da1837b0e5937788f8f099.zip | |
devel/electron25: 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/electron25/files/patch-net_dns_BUILD.gn | 12 | ||||
| -rw-r--r-- | devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py | 11 |
2 files changed, 22 insertions, 1 deletions
diff --git a/devel/electron25/files/patch-net_dns_BUILD.gn b/devel/electron25/files/patch-net_dns_BUILD.gn index 1760e1ccad94..5b564d8b900f 100644 --- a/devel/electron25/files/patch-net_dns_BUILD.gn +++ b/devel/electron25/files/patch-net_dns_BUILD.gn @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -165,6 +165,7 @@ source_set("dns") { +@@ -158,6 +158,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -165,6 +168,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", diff --git a/devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..5b825230bdc1 --- /dev/null +++ b/devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2023-06-27 00:56:05 UTC ++++ tools/gn/bootstrap/bootstrap.py +@@ -123,7 +123,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) |