From nobody Wed May 15 04:18:20 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VfKhr3fBMz5K63Z; Wed, 15 May 2024 04:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VfKhr2qGkz48R8; Wed, 15 May 2024 04:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHEj6Ld5Yy6kn6OyPPHkcGAPLXInKjeGkBk9VaKyw7E=; b=YgmUvMnAE9t6/6/UK44UjTYo2XHYieEAGKDDZLKDTNoMkN1CIrW9NO2DS7twRV2flImG1u mtLwDT82yWCZQ2nuqUNHfQ0OOeKNca4ZfZnN08fIvBoXtlI7yHKkieBSAp8WJL7u5ZrQ6B aU/AC2Ay6CtJi4nMcHt4bxpfbs92SXANpexFBz3Jr8KRevCBEdscPg8sB40iur4X+iOVos HIoDXjYxirScOna9htTwsSyalxV/yYuG8Pso+RjMiUQCIYk7c0popuah2t0zEyqBAQznZo ocr3OaccNaZhR+Wn/WXo4k9fD3pWSjYbyA/zUt02zEnd0B2bQp4H8XABTcG/+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715746700; a=rsa-sha256; cv=none; b=PHXl3kYDM6HF/LEsOEItLCdbN4MC2/eIl/CMFiHMQkNrNjfMikkh+okZs+UmgH1/Lw0Omd dT/OvA0ZyimmhuTr/gRLkmfCiSen+ft1oPuRgvDs7EidRY5CtKBX3560QzdoFBHqbGf+/I EG0hajoFGPAtFnJPVM4wFV14SRj+cAZ3RiX49MvQNYOizngLf6YyylwJL2t+xlRu1Ufa28 Ty91FP3nhZWPWE2bQu3Cyv3OsIsgA8CbrXVh/lIyC27XsNKWPK1r6ZvYaKt2Oik2n6Wf8v uZ0jQQWy/9wA0QuseYu4YA29LrmBuYmFxI6TdM4RcpPuM7fRWoAb33lSWYmWyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHEj6Ld5Yy6kn6OyPPHkcGAPLXInKjeGkBk9VaKyw7E=; b=ShHKFUDBPnHMbsx7sUDZuea7Y9OI1gE34yknJXR1iLqAohppm4EJo5qc0EutWT+koxqBfW Fg0UC7B/eJfTUZrEspZ9smhs5peXTVRTSRi92TAT183owsTA67umf/W2M0Ob7fDVpHrPuV 0EPIQlx3IwJxuYW24Tr4rUIx4zH8F5K6tyg7yKnsXoInBadDUpFdSVjDpK5Je6q/lGKEB3 X+9aKRCgfkfQc5q+KUqddOy1vbMno/XL88G+6s+zUzijtNY6aIIyo/LPKbS+Qfs0KfE/I2 +JzqbLTtCI9ZEzefv6YV+++tjV7XtJhZU3b+UDnY+116N1l3x7JM4H9Wvd+qkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VfKhr2QY2z10th; Wed, 15 May 2024 04:18:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44F4IK04072026; Wed, 15 May 2024 04:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F4IKIT072023; Wed, 15 May 2024 04:18:20 GMT (envelope-from git) Date: Wed, 15 May 2024 04:18:20 GMT Message-Id: <202405150418.44F4IKIT072023@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 4da1e7401561 - main - devel/electron25: Fix build with ninja 1.12.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4da1e7401561ac8d28da1837b0e5937788f8f099 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4da1e7401561ac8d28da1837b0e5937788f8f099 commit 4da1e7401561ac8d28da1837b0e5937788f8f099 Author: Jason E. Hale AuthorDate: 2024-05-11 22:57:57 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 04:11:00 +0000 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) --- devel/electron25/files/patch-net_dns_BUILD.gn | 12 +++++++++++- devel/electron25/files/patch-tools_gn_bootstrap_bootstrap.py | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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)