From owner-svn-ports-all@FreeBSD.ORG Sun May 31 14:58:19 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBAA77C9; Sun, 31 May 2015 14:58:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BD3841095; Sun, 31 May 2015 14:58:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4VEwJDH091642; Sun, 31 May 2015 14:58:19 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4VEwIFE091635; Sun, 31 May 2015 14:58:18 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201505311458.t4VEwIFE091635@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 31 May 2015 14:58:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388095 - in head/databases/rocksdb: . files X-SVN-Group: ports-head 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.20 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: Sun, 31 May 2015 14:58:20 -0000 Author: sunpoet Date: Sun May 31 14:58:17 2015 New Revision: 388095 URL: https://svnweb.freebsd.org/changeset/ports/388095 Log: - Update to 3.11 Changes: https://github.com/facebook/rocksdb/releases Added: head/databases/rocksdb/files/patch-util-thread_status_impl.cc (contents, props changed) Deleted: head/databases/rocksdb/files/patch-db_memtablerep__bench.cc head/databases/rocksdb/files/patch-util-logging.cc Modified: head/databases/rocksdb/Makefile head/databases/rocksdb/distinfo head/databases/rocksdb/pkg-plist Modified: head/databases/rocksdb/Makefile ============================================================================== --- head/databases/rocksdb/Makefile Sun May 31 14:30:55 2015 (r388094) +++ head/databases/rocksdb/Makefile Sun May 31 14:58:17 2015 (r388095) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 3.10.2 +PORTVERSION= 3.11 DISTVERSIONPREFIX= rocksdb- CATEGORIES= databases @@ -15,7 +15,7 @@ LIB_DEPENDS= libgflags.so:${PORTSDIR}/de libsnappy.so:${PORTSDIR}/archivers/snappy ALL_TARGET= shared_lib all -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include CPPFLAGS+= -DOS_FREEBSD LDFLAGS+= -L${LOCALBASE}/lib USE_CXXSTD= c++11 @@ -25,7 +25,7 @@ USES= compiler:c++11-lib gmake GH_ACCOUNT= facebook USE_GITHUB= yes -PROGRAMS= db_bench db_repl_stress db_sanity_test db_stress ldb log_and_apply_bench signal_test sst_dump table_reader_bench +PROGRAMS= db_bench db_repl_stress db_sanity_test db_stress ldb sst_dump table_reader_bench .include @@ -33,9 +33,12 @@ PROGRAMS= db_bench db_repl_stress db_san CFLAGS+= -D_GLIBCXX_USE_C99 .endif -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 +.if ${COMPILER_TYPE} == clang +#CXXFLAGS+= -Wno-shift-count-overflow +.if ${COMPILER_VERSION} >= 36 CXXFLAGS+= -Wno-inconsistent-missing-override .endif +.endif post-patch: @${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile @@ -43,6 +46,9 @@ post-patch: .if defined(WITHOUT_PROFILE) @${REINPLACE_CMD} -e '/pg = / s| -pg||' ${WRKSRC}/Makefile .endif +.if !defined(MACHINE_CPU:Msse42) +# @${REINPLACE_CMD} -e 's| -msse4.2||' ${WRKSRC}/build_tools/build_detect_platform +.endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/rocksdb/ ${STAGEDIR}${DATADIR}/ Modified: head/databases/rocksdb/distinfo ============================================================================== --- head/databases/rocksdb/distinfo Sun May 31 14:30:55 2015 (r388094) +++ head/databases/rocksdb/distinfo Sun May 31 14:58:17 2015 (r388095) @@ -1,2 +1,2 @@ -SHA256 (facebook-rocksdb-rocksdb-3.10.2_GH0.tar.gz) = 5ace408b12e5e5c836c9ba0b1bd57662784d15820cd02b203459b3ac2e01fde7 -SIZE (facebook-rocksdb-rocksdb-3.10.2_GH0.tar.gz) = 1602427 +SHA256 (facebook-rocksdb-rocksdb-3.11_GH0.tar.gz) = 84ddbcbecc956aacc947d1109d79624e972fb7042fc48a8b3481f04566bc2e36 +SIZE (facebook-rocksdb-rocksdb-3.11_GH0.tar.gz) = 1639978 Added: head/databases/rocksdb/files/patch-util-thread_status_impl.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/rocksdb/files/patch-util-thread_status_impl.cc Sun May 31 14:58:17 2015 (r388095) @@ -0,0 +1,11 @@ +--- util/thread_status_impl.cc.orig 2015-05-20 01:42:17 UTC ++++ util/thread_status_impl.cc +@@ -100,7 +100,7 @@ std::map + property_map.insert( + {"BaseInputLevel", op_properties[i] >> 32}); + property_map.insert( +- {"OutputLevel", op_properties[i] % (1LU << 32)}); ++ {"OutputLevel", op_properties[i] % ((uint64_t) 1LU << 32)}); + } else if (op_type == OP_COMPACTION && + i == COMPACTION_PROP_FLAGS) { + property_map.insert( Modified: head/databases/rocksdb/pkg-plist ============================================================================== --- head/databases/rocksdb/pkg-plist Sun May 31 14:30:55 2015 (r388094) +++ head/databases/rocksdb/pkg-plist Sun May 31 14:58:17 2015 (r388095) @@ -3,8 +3,6 @@ bin/db_repl_stress bin/db_sanity_test bin/db_stress bin/ldb -bin/log_and_apply_bench -bin/signal_test bin/sst_dump bin/table_reader_bench include/rocksdb/c.h @@ -13,6 +11,7 @@ include/rocksdb/compaction_filter.h include/rocksdb/comparator.h include/rocksdb/db.h include/rocksdb/env.h +include/rocksdb/experimental.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h include/rocksdb/immutable_options.h @@ -42,6 +41,7 @@ include/rocksdb/utilities/checkpoint.h include/rocksdb/utilities/convenience.h include/rocksdb/utilities/db_ttl.h include/rocksdb/utilities/document_db.h +include/rocksdb/utilities/flashcache.h include/rocksdb/utilities/geo_db.h include/rocksdb/utilities/json_document.h include/rocksdb/utilities/leveldb_options.h