From owner-svn-ports-all@freebsd.org Tue Mar 17 22:34:59 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 566952747B0; Tue, 17 Mar 2020 22:34:59 +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 48hnzl0YnMz421Y; Tue, 17 Mar 2020 22:34:59 +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 DF94518592; Tue, 17 Mar 2020 22:34:58 +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 02HMYwWo092175; Tue, 17 Mar 2020 22:34:58 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02HMYwXd092173; Tue, 17 Mar 2020 22:34:58 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202003172234.02HMYwXd092173@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 17 Mar 2020 22:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528607 - in head: net-p2p/parity-ethereum/files textproc/sonic/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head: net-p2p/parity-ethereum/files textproc/sonic/files X-SVN-Commit-Revision: 528607 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: Tue, 17 Mar 2020 22:34:59 -0000 Author: tobik Date: Tue Mar 17 22:34:58 2020 New Revision: 528607 URL: https://svnweb.freebsd.org/changeset/ports/528607 Log: Unbreak librocksdb-sys crate build after 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. Added: head/net-p2p/parity-ethereum/files/patch-cargo-crates_librocksdb-sys-6.2.4_rocksdb_util_channel.h (contents, props changed) head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h (contents, props changed) Added: head/net-p2p/parity-ethereum/files/patch-cargo-crates_librocksdb-sys-6.2.4_rocksdb_util_channel.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/parity-ethereum/files/patch-cargo-crates_librocksdb-sys-6.2.4_rocksdb_util_channel.h Tue Mar 17 22:34:58 2020 (r528607) @@ -0,0 +1,28 @@ +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. + +https://github.com/facebook/rocksdb/commit/a796c06fef6a8e43d793f8e627db3f29e6f95964 + +--- cargo-crates/librocksdb-sys-6.2.4/rocksdb/util/channel.h.orig 2020-03-15 20:19:45 UTC ++++ cargo-crates/librocksdb-sys-6.2.4/rocksdb/util/channel.h +@@ -60,7 +60,7 @@ class channel { + + private: + std::condition_variable cv_; +- std::mutex lock_; ++ mutable std::mutex lock_; + std::queue buffer_; + bool eof_; + }; Added: head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sonic/files/patch-cargo-crates_librocksdb-sys-6.1.3_rocksdb_util_channel.h Tue Mar 17 22:34:58 2020 (r528607) @@ -0,0 +1,28 @@ +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. + +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 { + + private: + std::condition_variable cv_; +- std::mutex lock_; ++ mutable std::mutex lock_; + std::queue buffer_; + bool eof_; + };