Date: Tue, 15 Sep 2015 13:09:32 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396958 - in head/databases/rocksdb: . files Message-ID: <201509151309.t8FD9W2i083906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 15 13:09:32 2015 New Revision: 396958 URL: https://svnweb.freebsd.org/changeset/ports/396958 Log: - Fix build on i386 - Add LICENSE_FILE Approved by: portmgr blanket Added: head/databases/rocksdb/files/patch-tools_db__stress.cc (contents, props changed) head/databases/rocksdb/files/patch-util_sst__dump_tool.cc (contents, props changed) head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc (contents, props changed) Modified: head/databases/rocksdb/Makefile Modified: head/databases/rocksdb/Makefile ============================================================================== --- head/databases/rocksdb/Makefile Tue Sep 15 13:01:34 2015 (r396957) +++ head/databases/rocksdb/Makefile Tue Sep 15 13:09:32 2015 (r396958) @@ -10,6 +10,7 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Persistent key-value store for fast storage environments LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgflags.so:${PORTSDIR}/devel/gflags \ libsnappy.so:${PORTSDIR}/archivers/snappy Added: head/databases/rocksdb/files/patch-tools_db__stress.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-tools_db__stress.cc Tue Sep 15 13:09:32 2015 (r396958) @@ -0,0 +1,11 @@ +--- tools/db_stress.cc.orig 2015-08-31 18:23:39 UTC ++++ tools/db_stress.cc +@@ -222,7 +222,7 @@ DEFINE_int32(set_options_one_in, 0, + DEFINE_int32(set_in_place_one_in, 0, + "With a chance of 1/N, toggle in place support option"); + +-DEFINE_int64(cache_size, 2 * KB * KB * KB, ++DEFINE_int64(cache_size, 2LL * KB * KB * KB, + "Number of bytes to use as a cache of uncompressed data."); + + static bool ValidateInt32Positive(const char* flagname, int32_t value) { Added: head/databases/rocksdb/files/patch-util_sst__dump_tool.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util_sst__dump_tool.cc Tue Sep 15 13:09:32 2015 (r396958) @@ -0,0 +1,11 @@ +--- util/sst_dump_tool.cc.orig 2015-08-31 18:23:39 UTC ++++ util/sst_dump_tool.cc +@@ -164,7 +164,7 @@ int SstFileReader::ShowAllCompressionSiz + compress_type.insert( + std::make_pair(CompressionType::kLZ4HCCompression, "kLZ4HCCompression")); + +- fprintf(stdout, "Block Size: %lu\n", block_size); ++ fprintf(stdout, "Block Size: %zu\n", block_size); + + for (CompressionType i = CompressionType::kNoCompression; + i != CompressionType::kLZ4HCCompression; i = CompressionType(i + 1)) { Added: head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-utilities_checkpoint_checkpoint.cc Tue Sep 15 13:09:32 2015 (r396958) @@ -0,0 +1,11 @@ +--- utilities/checkpoint/checkpoint.cc.orig 2015-08-31 18:23:39 UTC ++++ utilities/checkpoint/checkpoint.cc +@@ -131,7 +131,7 @@ Status CheckpointImpl::CreateCheckpoint( + (type == kDescriptorFile) ? manifest_file_size : 0); + } + } +- Log(db_->GetOptions().info_log, "Number of log files %ld", ++ Log(db_->GetOptions().info_log, "Number of log files %zu", + live_wal_files.size()); + + // Link WAL files. Copy exact size of last one because it is the only one
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509151309.t8FD9W2i083906>