From nobody Wed May 15 04:18:23 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 4VfKhw27NWz5K5j5; Wed, 15 May 2024 04:18:24 +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 4VfKhv6G5Bz48bc; Wed, 15 May 2024 04:18:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715746703; 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=UHaW+J9CQOmmRQhrQcVjQXqVeyulkHULGHpS0WXs7qI=; b=kHDZHdbk9663mKa/r+gRCYf0yik060lZxyV/62NJ/cEDeguBAuTu+ldY7Y6H8uDGwz8RGH rlJY4Nh5ZSSfsIQYLFMjICt38EyryJJaU0ng71vWGYtHH3FW8OAgeHOSxHutUIxgsaQLh6 xdeS0ZZmLWOrfCUvB7dut7WSxSicrNv8RTtNlHx7AtzGMhM+GjbuLgt8MbJCn/0bsax+qT oqFtE4QYO7x3WRV+khAB1H4Gi37MLuuRhsikCOY4DySqz61a/0yStMOb9moo6dMSeFvNJ4 fK6t++KbLS1O4VSpAvPjvtyPTOpKQ97pMcCKhD9S/XoxEf4kUBV0eiBu5IiaVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715746703; a=rsa-sha256; cv=none; b=QbYigV7Hs/mBawAeT+z9Qt/wR+naoVnOFVOurna44KeBQKbMUaowxfrZ6+REdGtV8Pq5Ua knvNiyDKAlsGAJ3EzZJ2YhDW0UjjRtuiWqPJe0sDk4Y5uSg1yel583e33ejBi0NS2kw5al +n7rpc5B+4azUH8S5LlgahhJQlP6FZq0lWKSdvELUMuv4GFYi9NZQ234+SUDiIQUjTS0/z 6PQT0ZdybryykAstoMh9miIV9qUdn9O+9aL/5ufmi6hedmf0a3spZMrsI/0w2GnyuaRgs+ +R5NTNObbTrTNUTxtoWMYqw0faC0G3GfQ7h0GAVaNcvKnnca0XNs05uWF9iCBA== 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=1715746703; 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=UHaW+J9CQOmmRQhrQcVjQXqVeyulkHULGHpS0WXs7qI=; b=NyvB+osCuE0C/G/9mxIJjjM/B82rEi37lKJ47UQ5WCOWHC5yKIi9YEHs9Gt8/LCZLPctmC BaG5sA7PsQcJdsFj9GbfQf6XavLrlsu88DiIMGVLMCtRfuJGI6K329JoWZ0zxQMW/GewBm 8F8LPdBlMJ8PJUzsTNfQau8r4hpKyVyBB8aNsEc2elW02TnBXc/WW55FnTxOqbuhjrLLkJ m8UlgqwD/gBkB3unbDpQy/GH7iSDhnRkwdFvKHrxiL9lPP8Us0Hez+2zUpspD9HAkFyQmE y1WNFKqCD/DZuEswo/9LDyLvUVCyo014my3fHNFjF2WfRK20k+KgTuQK2Kg19w== 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 4VfKhv5Dxgz10tj; Wed, 15 May 2024 04:18:23 +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 44F4INJM072177; Wed, 15 May 2024 04:18:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44F4INOW072174; Wed, 15 May 2024 04:18:23 GMT (envelope-from git) Date: Wed, 15 May 2024 04:18:23 GMT Message-Id: <202405150418.44F4INOW072174@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: 8fed35cd38a5 - main - devel/electron29: 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: 8fed35cd38a5a5ded99113e7f23044d32d1190a8 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=8fed35cd38a5a5ded99113e7f23044d32d1190a8 commit 8fed35cd38a5a5ded99113e7f23044d32d1190a8 Author: Jason E. Hale AuthorDate: 2024-05-15 04:06:03 +0000 Commit: Jason E. Hale CommitDate: 2024-05-15 04:11:25 +0000 devel/electron29: 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/electron29/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/electron29/files/patch-net_dns_BUILD.gn b/devel/electron29/files/patch-net_dns_BUILD.gn index d68c15ad483c..c2fde7db3711 100644 --- a/devel/electron29/files/patch-net_dns_BUILD.gn +++ b/devel/electron29/files/patch-net_dns_BUILD.gn @@ -1,4 +1,4 @@ ---- net/dns/BUILD.gn.orig 2024-02-27 21:36:00 UTC +--- net/dns/BUILD.gn.orig 2024-05-15 04:02:38 UTC +++ net/dns/BUILD.gn @@ -134,7 +134,7 @@ source_set("dns") { "dns_config_service_android.cc", @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -175,6 +175,7 @@ source_set("dns") { +@@ -168,6 +168,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//components/services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -175,6 +178,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -442,9 +443,9 @@ source_set("tests") { +@@ -442,9 +446,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] diff --git a/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py b/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py new file mode 100644 index 000000000000..a9c00cd3ce53 --- /dev/null +++ b/devel/electron29/files/patch-tools_gn_bootstrap_bootstrap.py @@ -0,0 +1,11 @@ +--- tools/gn/bootstrap/bootstrap.py.orig 2024-03-13 00:26:15 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)