From owner-svn-ports-head@freebsd.org Mon Nov 26 18:59:30 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 130701140AD6; Mon, 26 Nov 2018 18:59:30 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ADD75830EB; Mon, 26 Nov 2018 18:59:29 +0000 (UTC) (envelope-from sunpoet@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 8FA597F44; Mon, 26 Nov 2018 18:59:29 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAQIxTRZ059218; Mon, 26 Nov 2018 18:59:29 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAQIxTrF059216; Mon, 26 Nov 2018 18:59:29 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201811261859.wAQIxTrF059216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 26 Nov 2018 18:59:29 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/databases: rocksdb-lite rocksdb/files X-SVN-Commit-Revision: 485951 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: ADD75830EB X-Spamd-Result: default: False [1.51 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_SHORT(0.30)[0.300,0]; NEURAL_SPAM_MEDIUM(0.56)[0.562,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2018 18:59:30 -0000 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) {