Date: Mon, 26 Nov 2018 18:59:29 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485951 - in head/databases: rocksdb-lite rocksdb/files Message-ID: <201811261859.wAQIxTrF059216@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Nov 26 18:59:28 2018 New Revision: 485951 URL: https://svnweb.freebsd.org/changeset/ports/485951 Log: Fix build and unbreak this port Approved by: portmgr (blanket) Modified: head/databases/rocksdb-lite/Makefile head/databases/rocksdb/files/patch-tools-db_bench_tool.cc Modified: head/databases/rocksdb-lite/Makefile ============================================================================== --- head/databases/rocksdb-lite/Makefile Mon Nov 26 18:01:54 2018 (r485950) +++ head/databases/rocksdb-lite/Makefile Mon Nov 26 18:59:28 2018 (r485951) @@ -9,7 +9,6 @@ COMMENT= Persistent key-value store for fast storage e LITE= yes MASTERDIR= ${.CURDIR}/../rocksdb -BROKEN= fails to build BROKEN_armv6= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') BROKEN_armv7= does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int') Modified: head/databases/rocksdb/files/patch-tools-db_bench_tool.cc ============================================================================== --- head/databases/rocksdb/files/patch-tools-db_bench_tool.cc Mon Nov 26 18:01:54 2018 (r485950) +++ head/databases/rocksdb/files/patch-tools-db_bench_tool.cc Mon Nov 26 18:59:28 2018 (r485951) @@ -1,6 +1,16 @@ --- tools/db_bench_tool.cc.orig 2018-11-12 19:57:32 UTC +++ tools/db_bench_tool.cc -@@ -4229,7 +4229,7 @@ void VerifyDBFromDB(std::string& truth_d +@@ -1973,7 +1973,9 @@ class Benchmark { + int64_t max_num_range_tombstones_; + WriteOptions write_options_; + Options open_options_; // keep options around to properly destroy db later ++#ifndef ROCKSDB_LITE + TraceOptions trace_options_; ++#endif + int64_t reads_; + int64_t deletes_; + double read_random_exp_range_; +@@ -4229,7 +4231,7 @@ void VerifyDBFromDB(std::string& truth_d } if (levelMeta.level == 0) { for (auto& fileMeta : levelMeta.files) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811261859.wAQIxTrF059216>