Date: Wed, 18 Mar 2020 12:04:51 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528645 - in head: databases/arangodb32/files databases/arangodb33/files databases/cockroach/files net/ceph12/files net/ceph13/files net/ceph14/files Message-ID: <202003181204.02IC4pSg086928@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Mar 18 12:04:51 2020 New Revision: 528645 URL: https://svnweb.freebsd.org/changeset/ports/528645 Log: Fix more fallout for bundled rocksdb after the LLVM 10 import In file included from rocksdb/utilities/backupable/backupable_db.cc:16: rocksdb/util/channel.h:35:33: error: no matching constructor for initialization of 'std::lock_guard<std::mutex>' std::lock_guard<std::mutex> lk(lock_); ^ ~~~~~ /usr/include/c++/v1/__mutex_base:90:14: note: candidate constructor not viable: 1st argument ('const std::mutex') would lose const qualifier explicit lock_guard(mutex_type& __m) _LIBCPP_THREAD_SAFETY_ANNOTATION(acquire_capability(__m)) ^ /usr/include/c++/v1/__mutex_base:100:5: note: candidate constructor not viable: no known conversion from 'const std::mutex' to 'const std::__1::lock_guard<std::__1::mutex>' for 1st argument lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; ^ /usr/include/c++/v1/__mutex_base:94:5: note: candidate constructor not viable: requires 2 arguments, but 1 was provided lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_THREAD_SAFETY_ANNOTATION(requires_capability(__m)) ^ 1 error generated. net/ceph* will still not build because Clang crashes but at least it goes beyond the above error. Added: head/databases/arangodb32/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h head/databases/arangodb33/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h head/net/ceph12/files/patch-src_rocksdb_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h head/net/ceph13/files/patch-src_rocksdb_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h head/net/ceph14/files/patch-src_rocksdb_util_channel.h - copied, changed from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Copied and modified: head/databases/arangodb32/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/databases/arangodb32/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- 3rdParty/rocksdb/v5.6.X/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ 3rdParty/rocksdb/v5.6.X/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_; Copied and modified: head/databases/arangodb33/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/databases/arangodb33/files/patch-3rdParty_rocksdb_v5.6.X_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- 3rdParty/rocksdb/v5.6.X/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ 3rdParty/rocksdb/v5.6.X/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_; Copied and modified: head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_; Copied and modified: head/net/ceph12/files/patch-src_rocksdb_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/net/ceph12/files/patch-src_rocksdb_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- src/rocksdb/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ src/rocksdb/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_; Copied and modified: head/net/ceph13/files/patch-src_rocksdb_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/net/ceph13/files/patch-src_rocksdb_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- src/rocksdb/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ src/rocksdb/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_; Copied and modified: head/net/ceph14/files/patch-src_rocksdb_util_channel.h (from r528627, head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h) ============================================================================== --- head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Wed Mar 18 07:02:14 2020 (r528627, copy source) +++ head/net/ceph14/files/patch-src_rocksdb_util_channel.h Wed Mar 18 12:04:51 2020 (r528645) @@ -15,9 +15,9 @@ rocksdb/util/channel.h:35:33: error: no matching const https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 ---- cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC -+++ cargo-crates/librocksdb-sys-6.1.3/rocksdb/util/channel.h -@@ -60,7 +60,7 @@ class channel { +--- src/rocksdb/util/channel.h.orig 2018-04-13 11:22:33 UTC ++++ src/rocksdb/util/channel.h +@@ -62,7 +62,7 @@ class channel { private: std::condition_variable cv_;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003181204.02IC4pSg086928>