Index: branches/2015Q2/databases/rocksdb/Makefile =================================================================== --- branches/2015Q2/databases/rocksdb/Makefile (revision 385268) +++ branches/2015Q2/databases/rocksdb/Makefile (revision 385269) @@ -1,52 +1,56 @@ # Created by: Sunpoet Po-Chuan Hsieh # $FreeBSD$ PORTNAME= rocksdb -PORTVERSION= 3.9.1 +PORTVERSION= 3.10 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org COMMENT= Persistent key-value store for fast storage environments LICENSE= BSD3CLAUSE LIB_DEPENDS= libgflags.so:${PORTSDIR}/devel/gflags \ libsnappy.so:${PORTSDIR}/archivers/snappy ALL_TARGET= shared_lib all CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -DOS_FREEBSD LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes USES= compiler:c++11-lib gmake GH_ACCOUNT= facebook GH_PROJECT= ${PORTNAME} -GH_TAGNAME= ${PORTNAME}-${PORTVERSION} +GH_TAGNAME= v${PORTVERSION} USE_GITHUB= yes -PROGRAMS= blob_store_bench 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 log_and_apply_bench signal_test sst_dump table_reader_bench +.include + +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 36 +CXXFLAGS+= -Wno-inconsistent-missing-override +.endif + post-patch: - @${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||; s| -Werror||' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/^all: / s| $$(TESTS)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's| -fno-builtin-memcmp||; s| -ltcmalloc||' ${WRKSRC}/build_tools/build_detect_platform @${REINPLACE_CMD} -e '/PLATFORM_IS_LITTLE_ENDIAN/ s|__|_|g' ${WRKSRC}/port/port_posix.h .if defined(WITHOUT_PROFILE) @${REINPLACE_CMD} -e 's| -pg||' ${WRKSRC}/Makefile .endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/rocksdb/ ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin/ cd ${WRKSRC}/include/rocksdb/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/rocksdb/ ${INSTALL_LIB} ${WRKSRC}/librocksdb.a ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_LIB} ${WRKSRC}/librocksdb.so ${STAGEDIR}${PREFIX}/lib/librocksdb.so.0 ${LN} -fs librocksdb.so.0 ${STAGEDIR}${PREFIX}/lib/librocksdb.so - ${INSTALL_DATA} ${WRKSRC}/build_config.mk ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/ regression-test test: build cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check -.include +.include Index: branches/2015Q2/databases/rocksdb/distinfo =================================================================== --- branches/2015Q2/databases/rocksdb/distinfo (revision 385268) +++ branches/2015Q2/databases/rocksdb/distinfo (revision 385269) @@ -1,2 +1,2 @@ -SHA256 (facebook-rocksdb-3.9.1-rocksdb-3.9.1_GH0.tar.gz) = 6228ca0fcec486b03233fc5824bd955c8a749ab45d0481630bba2da7fdeba634 -SIZE (facebook-rocksdb-3.9.1-rocksdb-3.9.1_GH0.tar.gz) = 1275843 +SHA256 (facebook-rocksdb-3.10-v3.10_GH0.tar.gz) = 69014675eb1bd517c21ef92eac067cf3ac010ee6103bffccec11ceb771c4f7b7 +SIZE (facebook-rocksdb-3.10-v3.10_GH0.tar.gz) = 1601600 Index: branches/2015Q2/databases/rocksdb/files/patch-util-log_buffer.h =================================================================== --- branches/2015Q2/databases/rocksdb/files/patch-util-log_buffer.h (revision 385268) +++ branches/2015Q2/databases/rocksdb/files/patch-util-log_buffer.h (nonexistent) @@ -1,10 +0,0 @@ ---- util/log_buffer.h.orig 2014-06-20 07:40:32.000000000 +0800 -+++ util/log_buffer.h 2014-07-22 22:10:43.912828365 +0800 -@@ -5,6 +5,7 @@ - - #pragma once - -+#include - #include "rocksdb/env.h" - #include "util/arena.h" - #include "util/autovector.h" Property changes on: branches/2015Q2/databases/rocksdb/files/patch-util-log_buffer.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2015Q2/databases/rocksdb/pkg-plist =================================================================== --- branches/2015Q2/databases/rocksdb/pkg-plist (revision 385268) +++ branches/2015Q2/databases/rocksdb/pkg-plist (revision 385269) @@ -1,57 +1,58 @@ -bin/blob_store_bench bin/db_bench 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 include/rocksdb/cache.h include/rocksdb/compaction_filter.h include/rocksdb/comparator.h include/rocksdb/db.h include/rocksdb/env.h include/rocksdb/filter_policy.h include/rocksdb/flush_block_policy.h include/rocksdb/immutable_options.h include/rocksdb/iostats_context.h include/rocksdb/iterator.h include/rocksdb/ldb_tool.h include/rocksdb/listener.h include/rocksdb/memtablerep.h include/rocksdb/merge_operator.h include/rocksdb/metadata.h include/rocksdb/options.h include/rocksdb/perf_context.h include/rocksdb/rate_limiter.h include/rocksdb/slice.h include/rocksdb/slice_transform.h include/rocksdb/sst_dump_tool.h include/rocksdb/statistics.h include/rocksdb/status.h include/rocksdb/table.h include/rocksdb/table_properties.h +include/rocksdb/thread_status.h include/rocksdb/transaction_log.h include/rocksdb/types.h include/rocksdb/universal_compaction.h include/rocksdb/utilities/backupable_db.h 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/geo_db.h include/rocksdb/utilities/json_document.h include/rocksdb/utilities/leveldb_options.h include/rocksdb/utilities/spatial_db.h include/rocksdb/utilities/stackable_db.h include/rocksdb/utilities/utility_db.h include/rocksdb/utilities/write_batch_with_index.h include/rocksdb/version.h include/rocksdb/write_batch.h +include/rocksdb/write_batch_base.h lib/librocksdb.a lib/librocksdb.so lib/librocksdb.so.0 -%%DATADIR%%/build_config.mk +%%DATADIR%%/make_config.mk Index: branches/2015Q2 =================================================================== --- branches/2015Q2 (revision 385268) +++ branches/2015Q2 (revision 385269) Property changes on: branches/2015Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r383473