From owner-svn-ports-all@freebsd.org Wed Mar 18 12:04:53 2020 Return-Path: Delivered-To: svn-ports-all@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 4195A25E4BC; Wed, 18 Mar 2020 12:04:53 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48j7yF0Sxbz4J6F; Wed, 18 Mar 2020 12:04:53 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E42E921A64; Wed, 18 Mar 2020 12:04:52 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02IC4q10086933; Wed, 18 Mar 2020 12:04:52 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02IC4pSg086928; Wed, 18 Mar 2020 12:04:51 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003181204.02IC4pSg086928@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 18 Mar 2020 12:04:51 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: databases/arangodb32/files databases/arangodb33/files databases/cockroach/files net/ceph12/files net/ceph13/files net/ceph14/files X-SVN-Commit-Revision: 528645 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2020 12:04:53 -0000 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::lock_guard 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' 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_;