Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jan 2024 02:13:22 GMT
From:      Charlie Li <vishwin@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 56706caf7412 - main - databases/cockroach: fix build with GCC 13
Message-ID:  <202401090213.4092DML6096150@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=56706caf7412b675300389e594303bb26b35a907

commit 56706caf7412b675300389e594303bb26b35a907
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2024-01-09 02:10:03 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2024-01-09 02:10:03 +0000

    databases/cockroach: fix build with GCC 13
    
    Add #include <cstdint> 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 <cstdint>
++
+ //  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 <string>
++#include <cstdint>
+ #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 <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/slice.h"
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401090213.4092DML6096150>