Attachment 181527 Details for Bug 218409 – Diff for rocksdb port (updated)

[patch] Diff for rocksdb port (updated)

rocksdb.diff (text/plain), 4.50 KB, created by David Thiel on 2017-04-06 02:00:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Thiel

Created: 2017-04-06 02:00:52 UTC

Size: 4.50 KB

patch

obsolete

>diff -ruN /usr/ports/databases/rocksdb/Makefile rocksdb/Makefile
>--- /usr/ports/databases/rocksdb/Makefile	2017-04-01 08:23:30.000000000 -0700
>+++ rocksdb/Makefile	2017-04-05 18:35:45.000000000 -0700
>@@ -1,14 +1,13 @@
> # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
>-# $FreeBSD: head/databases/rocksdb/Makefile 437439 2017-04-01 15:23:30Z gerald $
>+# $FreeBSD: head/databases/rocksdb/Makefile 431896 2017-01-19 19:25:59Z sunpoet $
> 
> PORTNAME=	rocksdb
>-PORTVERSION=	5.0.2
>-PORTREVISION=	1
>+PORTVERSION=	5.2.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	databases
> 
>-MAINTAINER=	sunpoet@FreeBSD.org
>-COMMENT=	Persistent key-value store for fast storage environments
>+MAINTAINER?=	sunpoet@FreeBSD.org
>+COMMENT?=	Persistent key-value store for fast storage environments
> 
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
>@@ -35,8 +34,18 @@
> USE_CXXSTD=	c++11
> USE_LDCONFIG=	yes
> USES=		compiler:c++11-lib gmake localbase:ldflags
>+.if defined(LITE)
>+PKGNAMESUFFIX=	-lite
>+CONFLICTS_INSTALL=	rocksdb.*
>+CPPFLAGS+=	-DROCKSDB_LITE=1
>+PLIST_SUB+=	LITE=${PKGNAMESUFFIX}
>+MAKE_ENV+=	LIBNAME=lib${PORTNAME}${PKGNAMESUFFIX}
>+.else
>+PLIST_SUB+=	LITE=""
>+CONFLICTS_INSTALL=	rocksdb-lite.*
>+.endif
> 
>-PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_MAJOR=${PORTVERSION:R:R} SHLIB_MINOR=${PORTVERSION:R:E}
>+PLIST_SUB+=	PORTVERSION=${PORTVERSION} SHLIB_MAJOR=${PORTVERSION:R:R} SHLIB_MINOR=${PORTVERSION:R:E}
> PORTDATA=	make_config.mk
> 
> GH_ACCOUNT=	facebook
>@@ -81,8 +90,8 @@
> post-install:
> 	${MKDIR} ${STAGEDIR}${DATADIR}/
> 	cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so
>-	${INSTALL_DATA} ${WRKSRC}/librocksdb_tools.a ${STAGEDIR}${PREFIX}/lib/
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}${PKGNAMESUFFIX}.so
>+	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}${PKGNAMESUFFIX}_tools.a ${STAGEDIR}${PREFIX}/lib/
> 	${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/
> 
> regression-test test: build
>diff -ruN /usr/ports/databases/rocksdb/distinfo rocksdb/distinfo
>--- /usr/ports/databases/rocksdb/distinfo	2017-01-19 11:25:59.000000000 -0800
>+++ rocksdb/distinfo	2017-04-05 18:35:45.000000000 -0700
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1484836129
>-SHA256 (facebook-rocksdb-v5.0.2_GH0.tar.gz) = 5e39d2131ebdb92c30eda3d32861f489f4843fad50cc2fbd5d234bc4415948ca
>-SIZE (facebook-rocksdb-v5.0.2_GH0.tar.gz) = 2925364
>+TIMESTAMP = 1491425815
>+SHA256 (facebook-rocksdb-v5.2.1_GH0.tar.gz) = cb27afeaa3dea4369e7b982ce336c16ec2848879e7275043b94e9b42570158ec
>+SIZE (facebook-rocksdb-v5.2.1_GH0.tar.gz) = 3193948
>diff -ruN /usr/ports/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc rocksdb/files/patch-utilities-column_aware_encoding_exp.cc
>--- /usr/ports/databases/rocksdb/files/patch-utilities-column_aware_encoding_exp.cc	2016-12-13 09:50:13.000000000 -0800
>+++ rocksdb/files/patch-utilities-column_aware_encoding_exp.cc	1969-12-31 16:00:00.000000000 -0800
>@@ -1,10 +0,0 @@
>---- utilities/column_aware_encoding_exp.cc.orig	2016-12-09 20:59:51 UTC
>-+++ utilities/column_aware_encoding_exp.cc
>-@@ -8,6 +8,7 @@
>- #endif
>- 
>- #include <cstdio>
>-+#include <cstdlib>
>- 
>- #ifndef ROCKSDB_LITE
>- #ifdef GFLAGS
>diff -ruN /usr/ports/databases/rocksdb/pkg-plist rocksdb/pkg-plist
>--- /usr/ports/databases/rocksdb/pkg-plist	2017-01-08 12:42:42.000000000 -0800
>+++ rocksdb/pkg-plist	2017-04-05 18:35:45.000000000 -0700
>@@ -60,7 +60,6 @@
> include/rocksdb/utilities/document_db.h
> include/rocksdb/utilities/env_librados.h
> include/rocksdb/utilities/env_mirror.h
>-include/rocksdb/utilities/env_registry.h
> include/rocksdb/utilities/geo_db.h
> include/rocksdb/utilities/info_log_finder.h
> include/rocksdb/utilities/json_document.h
>@@ -71,6 +70,7 @@
> include/rocksdb/utilities/lua/rocks_lua_custom_library.h
> include/rocksdb/utilities/lua/rocks_lua_util.h
> include/rocksdb/utilities/memory_util.h
>+include/rocksdb/utilities/object_registry.h
> include/rocksdb/utilities/optimistic_transaction_db.h
> include/rocksdb/utilities/option_change_migration.h
> include/rocksdb/utilities/options_util.h
>@@ -88,9 +88,9 @@
> include/rocksdb/write_batch.h
> include/rocksdb/write_batch_base.h
> include/rocksdb/write_buffer_manager.h
>-lib/librocksdb.a
>-lib/librocksdb.so
>-lib/librocksdb.so.%%SHLIB_MAJOR%%
>-lib/librocksdb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
>-lib/librocksdb.so.%%PORTVERSION%%
>-lib/librocksdb_tools.a
>+lib/librocksdb%%LITE%%.a
>+lib/librocksdb%%LITE%%.so
>+lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%%
>+lib/librocksdb%%LITE%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
>+lib/librocksdb%%LITE%%.so.%%PORTVERSION%%
>+lib/librocksdb%%LITE%%_tools.a

Actions: View | Diff

Attachments on bug 218409: 181519 | 181520 | 181527 | 181528 | 181579