From nobody Wed May 15 04:18:22 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 4VfKhv1YHFz5K5fK; Wed, 15 May 2024 04:18:23 +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 4VfKht55Wlz48Wp; Wed, 15 May 2024 04:18:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746702; 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=QrhgDiwK9+9192Zor9pxJhpp3+9rEW4CxIg2p7eGh6g=; b=wPXZTnZrs0Do5Ln9O+NWOltYl5sP2BwouxoDUfH74xokAle6vDPjQuYhDauQnhpwQUxMk+ DqlzxZmvitrjKzrW6rVPO/f8oqG2d5sCBg2TlVLcsjEhcXOcFa4t0/2w/ExAbOAHgPdzc3 efQT0/LEzG+yyo99dlo/QeAADE++/BDTUHxlbTqRmwgUaY95t7c8aeK5yL9qzFvgradzsw I2Jud1n6rnCq6Klt92c+sP/jGg3lE4TOr6TF/lUMBa9IDFNjqzTC0J0DxykiP36z9wz+cx JRpTN6eGfwQUHTEQcZSnzQ76JAMhiOaCUd1OLJxdGnDl2BGpefmBomhTGNl+Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715746702; a=rsa-sha256; cv=none; b=F3WN6paO3kwsHXeHNHs0CplNnD8WIYh0W9IAPogj5LKczks5zAcz+K02K43hLp7Xf9mJ4A NepKMegBw4/axWhHe1dG6gafu/ZepLx8NVtfNuc0GhecQkc80tgvqk7B596cOTkAaxSwNe iERqGA+P4UizWe249Bv8OPPSHHRdHEjRqhxA4Af6rbql32a78V9avr+mc1FTv4TWBQ5Chj CEV1P/ideV2MCC4EVq4PacfCN6ygucCazMhorEpWa76rRTp1lDGU9ZbgpOzOoimju+Bcgp vV6z0dL+hQAlq5r26n8hch8tBOPoR8xmWLWKCW5++wIXPrIajlH9HDj1dbZ7Fg== 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=1715746702; 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=QrhgDiwK9+9192Zor9pxJhpp3+9rEW4CxIg2p7eGh6g=; b=pKBTOzMwE8+ACG0qbIuymYbJkt5T4fmElA9r7IvpPjmgxslaiLRAlXTT9M7ig8Lb0BqLD+ wRHYP/AkuB8Uw33AYEjf6RYo8Gm25knv06sECokWITp0vYt4ocaBUBa1h8tpRDejED4vyU bZtKgx1RrdH0Bmo1xQNRZ8qTE7bo21UBqBKzCl3Jony0bZ1vnEtqxIQI7xcSCEFxjyTLNv XEUdrEiQdya7yuUZk432yd2FMSQOaUD1d6Vqn5Jw56ANKPyXmilS2QD8GP/NjBn3zFRT6p IFTbSmMYJp4L8aDOgvIWitCrXaj0oSOurxY47W2i7BDbHIVWMMvk1BQ5FWmoqQ== 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 4VfKht4BV3z111L; Wed, 15 May 2024 04:18:22 +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 44F4IMts072129; Wed, 15 May 2024 04:18:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F4IMNO072126; Wed, 15 May 2024 04:18:22 GMT (envelope-from git) Date: Wed, 15 May 2024 04:18:22 GMT Message-Id: <202405150418.44F4IMNO072126@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: 4dc1764a37e0 - main - devel/electron28: 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: 4dc1764a37e029e61ab74d6292f28a88782081c2 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=4dc1764a37e029e61ab74d6292f28a88782081c2 commit 4dc1764a37e029e61ab74d6292f28a88782081c2 Author: Jason E. Hale AuthorDate: 2024-05-15 04:02:21 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 04:11:18 +0000 devel/electron28: 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/electron28/files/patch-net_dns_BUILD.gn | 16 +++++++++++++--- .../files/patch-tools_gn_bootstrap_bootstrap.py | 11 +++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/devel/electron28/files/patch-net_dns_BUILD.gn b/devel/electron28/files/patch-net_dns_BUILD.gn index ace61b87cb0b..b044772a8ba6 100644 --- a/devel/electron28/files/patch-net_dns_BUILD.gn +++ b/devel/electron28/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:51:14 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/electron28/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron28/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..4dc7101ada31 --- /dev/null +++ b/devel/electron28/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2024-01-16 20:56: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)