From nobody Wed May 15 04:18:21 2024 X-Original-To: dev-commits-ports-all@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 4VfKhs4X5Nz5K63b; Wed, 15 May 2024 04:18:21 +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 4VfKhs3ndmz486k; Wed, 15 May 2024 04:18:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746701; 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=jkLM0GR5wx4qFdFgqvDeYhEnVlkwkiwIJWxmx3IuUBY=; b=fefbSe94hzAKo8HRnvoXaJheJFg/4TYJd3kmFLApEmlaT5cWdWulIrsIo9aa6MeZTfNjQH /Qu5PHlxn7wkwwuZQCUXgZGAxPjDbQKiVCB1DCjnTcag39e+or5AeleW+f/1pq6kaaYDXN yQaawUSisNl81ipiqv7Xk+MwmxGT2JBCF3ZJEhIow/8KH6/QpIHoB52Ct2wZVxmSkZd1Rd kAfpY8z65dUgiSCwR/0foNFF6/Iq3G0vY8RHYLLbu1my3+gPrTrpiTixNztg4jQONnH9Bv J8qnjy9PBrL6yAv/ymBEWmyhk6uG/K78+VFooefq4rVmtsBSX5V8ghAF/bGCvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715746701; a=rsa-sha256; cv=none; b=lkCQNpCaLoN6VE83M/8xx9YC4lVJBlKvlSwAlNxYpI1ojZPPvM3+8iCv06KO02o3noEF8h JmCLQhqq3+gqXBY1WoWiZ0UsLzE+0db99oEeSTSbMTbtaEjniT8e49xbxBFoFK07MBnONU colwkf62czKJ7ePSzGOerQBUB9P6vABNTzV6U8BnqLV9YJabJy4XGlT15dwah0qMsieMUh nBdYJcaOKWz2zqg+RfxuwQNRzosY9VNuRtx+ksEwVLbkSB0/LDy+vi+b4yfYA2jfCinL/x vVt5Nz0huZNSkoYksTydXEFaeuZMU9Bpoay69hhnZ3b+8qGex0QNv04Bd9t1rQ== 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=1715746701; 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=jkLM0GR5wx4qFdFgqvDeYhEnVlkwkiwIJWxmx3IuUBY=; b=YZxgDCFS1hnFXAefLzrRlRVzv3rE3klNbUxGMp9/Nyk+JuBNE3QgAFhtH3kIN3ecD7kQIH VZWUSiF68KUBTNQuIJXYQtA5rzFj4sg3aXZkB/uqyS0fRIeBheC4+i4zLKktzr/3Kwtril VwOZoMttzZxj0oItHwSfOMK5aUZBtH0vBBcuClLNHQfHzlntDeXgVXrS3fsjY69aho9Vh2 4CoPhYnwfvgRhU33zB1ZzMg8Eegxss0JiApDkbkJYkRvZ3XgJCas5hPuh80QqOhyIiuEyx llRZ6FJlqrNS4HFTlj3ltr7KZEYs9PwH/Dn9VFS9LmT1AljXpivL3J9MJWfHbw== 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 4VfKhs33nGz10kD; Wed, 15 May 2024 04:18:21 +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 44F4ILpx072081; Wed, 15 May 2024 04:18:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F4ILUd072078; Wed, 15 May 2024 04:18:21 GMT (envelope-from git) Date: Wed, 15 May 2024 04:18:21 GMT Message-Id: <202405150418.44F4ILUd072078@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: a80c93491dee - main - devel/electron27: Fix build with ninja 1.12.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: a80c93491deebb797e3f8e520bb64155730339a3 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=a80c93491deebb797e3f8e520bb64155730339a3 commit a80c93491deebb797e3f8e520bb64155730339a3 Author: Jason E. Hale AuthorDate: 2024-05-15 04:01:11 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 04:11:11 +0000 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) --- devel/electron27/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/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)