From nobody Tue Jan 09 02:13: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 4T8DxG70Xgz55f93; Tue, 9 Jan 2024 02:13:22 +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 4T8DxG6WvWz4Sq9; Tue, 9 Jan 2024 02:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704766402; 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=4o5PEaQ1GFHNCgH5lFAZYjcapKpyFkfS5VGTB+eMwpc=; b=d1kb37fnurPaBMFntLddzXZ6XOdNc0jfG3q+tRBQpgY8wu+g085B2jAH/vyKcpJtmahrPY Ou9784NUs0yD1xjMHhVIc5it1gL+zWOhXMchvMD3x9zHN0L+qRoZ0FxxwlMf9+rLwaA61e 8NyXgrFT29H2cD2BME4fPFL1yk+AQweUOjPI+mF7C4NWwwjEmmrCur89j08F0BYtLkFOUR jzMieURwbR4KEM5ibjsb3mKZ4SrG3Akh/LVn6ckXX35D6zyEyQxeCJrJIKaioXNWHdyyQV cAAoXvItR1OoUKf9G8q/NvQfKDr4uJQdTTPcSBNDx49FPb66KVkXGLobMEDDyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704766402; 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=4o5PEaQ1GFHNCgH5lFAZYjcapKpyFkfS5VGTB+eMwpc=; b=rjXhCCtTJdSnlhAVlDsgwO07wmsXH4dV2l/mDxcB4V4+mohAMBSg9c6BDOWQBOBBmkf7Sq nWOF9V9ABLACxxmAK+TwYNX4ESljtKlU5WoLpCI7Asl23BWvtwUpsdjhe5TW1j5bKbEBJY bEsn+kTWRPLRHYJcd8yko45pNqp3rpXHLCKIFNAPOD4zz34YMo62E8uEUftmPN49s/FKKx 4MOhRXTTIGygf4YSFTfywcbE0WwovlHbM0peKrgE0C/XnKXQyjb+fFD1ZgKXtse6p0Bg/C ORHQsmOjAt3tlfuIhLuoTeAHZvcLBLmPLX8kJDV0Vfmz+qGXJuAKkO3Me/ozJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704766402; a=rsa-sha256; cv=none; b=VCbKa9DUcrqlO77memT0eHxDpOrbi9SXJA/zUU5J2ivGqKuyLL2DEAdsX8YVmX0CkZgMvA umWmTXATZwGSTxzNZ7hCsfm0VIl9FYGFqjdaMUZhocEaLMDNKWG9LKXUyXuK6fUxybfrt3 B52ipCO7InwkgmbJhWKPGziFvDX/Vx6xJAwbPHiqZCjWsGqrEHFQIMLkvTopqmQHYiw/wy 1gkMf59IL/eAZ3NmxFOq0/UqHAysxLSvvD8ldZtX+VA7X+35PY0HxIb/6/WIHVhWRC2eJ5 V9uQPUqhpGR4xkXVxI9W+O9pCcc/R2K712p96OPeVy79xUbvTLMTrRAbO6xyEw== 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 4T8DxG5ZZVzXxN; Tue, 9 Jan 2024 02:13: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 4092DMGb096153; Tue, 9 Jan 2024 02:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4092DML6096150; Tue, 9 Jan 2024 02:13:22 GMT (envelope-from git) Date: Tue, 9 Jan 2024 02:13:22 GMT Message-Id: <202401090213.4092DML6096150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 56706caf7412 - main - databases/cockroach: fix build with GCC 13 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56706caf7412b675300389e594303bb26b35a907 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=56706caf7412b675300389e594303bb26b35a907 commit 56706caf7412b675300389e594303bb26b35a907 Author: Charlie Li AuthorDate: 2024-01-09 02:10:03 +0000 Commit: Charlie Li CommitDate: 2024-01-09 02:10:03 +0000 databases/cockroach: fix build with GCC 13 Add #include where needed to fix building the bundled RocksDB. This is a stopgap measure until this port can be updated. Reported by: salvadore PR: 273673 --- ..._cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h | 8 ++++++++ ...roach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h | 10 ++++++++++ ...b_cockroach_c-deps_rocksdb_table_data__block__hash__index.h | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h new file mode 100644 index 000000000000..972eb51150c9 --- /dev/null +++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h @@ -0,0 +1,8 @@ +--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/db/compaction_iteration_stats.h.orig 2020-06-29 21:13:41 UTC ++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/db/compaction_iteration_stats.h +@@ -1,3 +1,5 @@ ++#include ++ + // Copyright (c) 2016-present, Facebook, Inc. All rights reserved. + // This source code is licensed under both the GPLv2 (found in the + // COPYING file in the root directory) and Apache 2.0 License diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h new file mode 100644 index 000000000000..8bdff4892d2d --- /dev/null +++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h @@ -0,0 +1,10 @@ +--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/include/rocksdb/utilities/checkpoint.h.orig 2020-06-29 21:13:41 UTC ++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -9,6 +9,7 @@ + #ifndef ROCKSDB_LITE + + #include ++#include + #include "rocksdb/status.h" + + namespace rocksdb { diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h new file mode 100644 index 000000000000..322ac1f1de5d --- /dev/null +++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h @@ -0,0 +1,10 @@ +--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/table/data_block_hash_index.h.orig 2020-06-29 21:13:41 UTC ++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/table/data_block_hash_index.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #include "rocksdb/slice.h" +