From owner-dev-commits-ports-main@freebsd.org Sat Apr 10 07:15:28 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B4055C6215; Sat, 10 Apr 2021 07:15:28 +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 4FHR9D1SSPz4bmM; Sat, 10 Apr 2021 07:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 23ADA4A7E; Sat, 10 Apr 2021 07:15:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13A7FSQh009565; Sat, 10 Apr 2021 07:15:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13A7FShF009564; Sat, 10 Apr 2021 07:15:28 GMT (envelope-from git) Date: Sat, 10 Apr 2021 07:15:28 GMT Message-Id: <202104100715.13A7FShF009564@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: fd4b97fafcd5 - main - devel/fbthrift: Add missing dependency on RocketUpgrade headers to thriftcpp2 target (D29353) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd4b97fafcd55dee6346f8698c98cd7d8277a7f7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Apr 2021 07:15:28 -0000 The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd4b97fafcd55dee6346f8698c98cd7d8277a7f7 commit fd4b97fafcd55dee6346f8698c98cd7d8277a7f7 Author: Michael Forney AuthorDate: 2021-04-10 07:14:59 +0000 Commit: Tobias Kortkamp CommitDate: 2021-04-10 07:14:59 +0000 devel/fbthrift: Add missing dependency on RocketUpgrade headers to thriftcpp2 target (D29353) One source file in this target, async/HeaderClientChannel.cpp, depends on the generated header RocketUpgradeAsyncClient.h, so it needs to depend on the target that generates this header. This causes a build error with samurai due to an incorrect build order, and can be reproduced with ninja as well by building thrift/lib/cpp2/CMakeFiles/thriftcpp2.dir/async/HeaderClientChannel.cpp.o directly with an empty .ninja_deps. https://github.com/michaelforney/samurai/issues/70 PR: 254678 --- .../files/patch-thrift_lib_cpp2_CMakeLists.txt | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/devel/fbthrift/files/patch-thrift_lib_cpp2_CMakeLists.txt b/devel/fbthrift/files/patch-thrift_lib_cpp2_CMakeLists.txt new file mode 100644 index 000000000000..bd74a9c7f7ab --- /dev/null +++ b/devel/fbthrift/files/patch-thrift_lib_cpp2_CMakeLists.txt @@ -0,0 +1,27 @@ +From 70a25a6f6d24fa8e9d8e7d4421a9e5cacf05a904 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 9 Apr 2021 18:19:10 -0700 +Subject: [PATCH] Add missing dependency on RocketUpgrade headers to thriftcpp2 + target + +One source file in this target, async/HeaderClientChannel.cpp, +depends on the generated header RocketUpgradeAsyncClient.h, so it +needs to depend on the target that generates this header. + +This causes a build error with samurai due to an incorrect build +order, and can be reproduced with ninja as well by building +thrift/lib/cpp2/CMakeFiles/thriftcpp2.dir/async/HeaderClientChannel.cpp.o +directly with an empty .ninja_deps. + +https://github.com/facebook/fbthrift/pull/422 + +--- thrift/lib/cpp2/CMakeLists.txt.orig 2021-04-04 11:22:06 UTC ++++ thrift/lib/cpp2/CMakeLists.txt +@@ -208,6 +208,7 @@ add_dependencies( + thriftcpp2 + rpcmetadata + thriftmetadata ++ RocketUpgrade-cpp2-target + ) + target_link_libraries( + thriftcpp2