sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build and unbreak this port

Browse source 
Approved by:	portmgr (blanket)
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2018-11-26 18:59:28 +00:00
parent ed9cfd1a84
commit e351c7490b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=485951
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/rocksdb-lite/Makefile
View file

@ -9,7 +9,6 @@ COMMENT= Persistent key-value store for fast storage environments (lite version)
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')

12
databases/rocksdb/files/patch-tools-db_bench_tool.cc
View file

@ -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) {