Attachment #245898 for bug #274745

View | Details | Raw Unified | Return to bug 274745
Collapse All | Expand All




CATEGORIES=	databases

MAINTAINER=	zi@FreeBSD.org
COMMENT=	High performance persistent key-value database
WWW=		https://docs.keydb.dev/

LICENSE=	BSD3CLAUSE

LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
		liblz4.so:archivers/liblz4 \
		libsnappy.so:archivers/snappy \
		libzstd.so:archivers/zstd \
		liblinenoise.so:devel/linenoise

USES=		compiler:c++14-lang cpe gmake localbase:ldflags pkgconfig \
		tcl:test

USE_GITHUB=	yes
GH_ACCOUNT=	Snapchat

USE_RC_SUBR=	keydb keydb_sentinel

MAKE_ENV=	OPTIMIZATION= \
		V=1

LDFLAGS+=	-lm -lexecinfo
LDFLAGS+=	-lpthread -lm -lexecinfo -L${LOCALBASE}/lib

EXTRACT_AFTER_ARGS=	 --exclude deps/linenoise
SUB_FILES=	pkg-message
SUB_LIST=	PORTNAME=${PORTNAME} \
		KEYDB_DBDIR=${KEYDB_DBDIR} \

USERS=		keydb
GROUPS=		keydb

KEYDB_DBDIR?=	/var/db/keydb
KEYDB_RUNDIR?=	/var/run/keydb
KEYDB_LOGDIR?=	/var/log/keydb

BIN_FILES=	keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
		keydb-sentinel keydb-server

PLIST_SUB=	KEYDB_DBDIR=${KEYDB_DBDIR} \
		KEYDB_GROUP=${GROUPS} \
		KEYDB_LOGDIR=${KEYDB_LOGDIR} \

OPTIONS_DEFINE=		TLS
OPTIONS_DEFAULT=	TLS

TLS_DESC=		Use TLS (openssl req.)

TLS_USES=		ssl
TLS_MAKE_ENV=		BUILD_TLS=yes

BIN_FILES=	keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
		keydb-sentinel keydb-server

KEYDB_DBDIR?=	/var/db/keydb
KEYDB_RUNDIR?=	/var/run/keydb
KEYDB_LOGDIR?=	/var/log/keydb

.include <bsd.port.pre.mk>

.if ${ARCH} == i386 && !defined(CPUTYPE)
#LIB_DEPENDS+=	
CPUTYPE=	pentium
CFLAGS+=	-march=i586
.endif

#.if ${ARCH} == i386 && !${CFLAGS:M-march=*}
# Needed for __atomic_fetch_add_8
#USE_GCC=	yes
#CFLAGS+=	-march=i586
#.endif

.if defined(_ADDFLAGS)
CFLAGS+=	-fPIC
LDFLAGS+=	-Wl,-E




--- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
+++ deps/linenoise/Makefile
@@ -1,10 +1,10 @@
 STD=
 WARN= -Wall
-OPT= -Os
+#OPT= -Os
 
 R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
 R_LDFLAGS= $(LDFLAGS)
-DEBUG= -g
+#DEBUG= -g
 
 R_CC=$(CC) $(R_CFLAGS)
 R_LD=$(CC) $(R_LDFLAGS)

Lines 1-7 Link Here

(-)b/databases/keydb/files/patch-deps_Makefile (-3 / +6 lines)
1	--- deps/Makefile.orig 2023-10-25 17:16:24 UTC	1	--- deps/Makefile.orig 2023-04-20 22:17:21 UTC
2	+++ deps/Makefile	2	+++ deps/Makefile
3	@@ -38,7 +38,6 @@ distclean:	3	@@ -35,10 +35,8 @@ endif
4	-(cd linenoise && $(MAKE) clean) > /dev/null \|\| true	4
		5	distclean:
		6	-(cd hiredis && $(MAKE) clean) > /dev/null \|\| true
		7	- -(cd linenoise && $(MAKE) clean) > /dev/null \|\| true
5	-(cd lua && $(MAKE) clean) > /dev/null \|\| true	8	-(cd lua && $(MAKE) clean) > /dev/null \|\| true
6	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null \|\| true	9	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null \|\| true
7	- -(cd rocksdb && $(MAKE) clean) > /dev/null \|\| true	10	- -(cd rocksdb && $(MAKE) clean) > /dev/null \|\| true

Lines 1-5 Link Here

(-)b/databases/keydb/files/patch-src-Makefile (-1 / +30 lines)
1	--- src/Makefile.orig 2023-10-25 15:47:51 UTC	1	--- src/Makefile.orig 2023-04-20 22:17:21 UTC
2	+++ src/Makefile	2	+++ src/Makefile
		3	@@ -20,7 +20,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
		4	uname_S := $(shell sh -c 'uname -s 2>/dev/null \|\| echo not')
		5	uname_M := $(shell sh -c 'uname -m 2>/dev/null \|\| echo not')
		6	OPTIMIZATION?=-O2 -flto
		7	-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
		8	+DEPENDENCY_TARGETS=hiredis lua hdr_histogram
		9	NODEPS:=clean distclean
		10
		11	# Default settings
3	@@ -138,21 +138,11 @@ endif	12	@@ -138,21 +138,11 @@ endif
4	# Override default settings if possible	13	# Override default settings if possible
5	-include .make-settings	14	-include .make-settings
Lines 33-38 Link Here
33	else	42	else
34	ifeq ($(uname_S),DragonFly)	43	ifeq ($(uname_S),DragonFly)
35	# DragonFly	44	# DragonFly
		45	@@ -259,8 +251,8 @@ ifdef OPENSSL_PREFIX
		46	endif
		47
		48	# Include paths to dependencies
		49	-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
		50	-FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
		51	+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/lua/src -I../deps/hdr_histogram
		52	+FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
		53
		54	# Determine systemd support and/or build preference (defaulting to auto-detection)
		55	BUILD_WITH_SYSTEMD=no
36	@@ -347,7 +339,7 @@ else	56	@@ -347,7 +339,7 @@ else
37	endif	57	endif
38		58
Lines 50-52 Link Here
50	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))	70	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
51		71
52	.PHONY: persist-settings	72	.PHONY: persist-settings
		73	@@ -453,7 +444,7 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME)
		74
		75	# keydb-cli
		76	$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
		77	- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)
		78	+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a -llinenoise $(FINAL_LIBS)
		79
		80	# keydb-benchmark
		81	$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)

Return to bug 274745

Lines 4-10 DISTVERSION= 6.3.3 Link Here

(-)b/databases/keydb/Makefile (-18 / +25 lines)
4	CATEGORIES= databases	4	CATEGORIES= databases
5		5
6	MAINTAINER= zi@FreeBSD.org	6	MAINTAINER= zi@FreeBSD.org
7	COMMENT= High performance fork of Redis--a persistent key-value database	7	COMMENT= High performance persistent key-value database
8	WWW= https://docs.keydb.dev/	8	WWW= https://docs.keydb.dev/
9		9
10	LICENSE= BSD3CLAUSE	10	LICENSE= BSD3CLAUSE
Lines 13-21 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
13	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \	13	LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
14	liblz4.so:archivers/liblz4 \	14	liblz4.so:archivers/liblz4 \
15	libsnappy.so:archivers/snappy \	15	libsnappy.so:archivers/snappy \
16	libzstd.so:archivers/zstd	16	libzstd.so:archivers/zstd \
		17	liblinenoise.so:devel/linenoise
17		18
18	USES= compiler:c11 cpe gmake pkgconfig:build tcl:test	19	USES= compiler:c++14-lang cpe gmake localbase:ldflags pkgconfig \
		20	tcl:test
19		21
20	USE_GITHUB= yes	22	USE_GITHUB= yes
21	GH_ACCOUNT= Snapchat	23	GH_ACCOUNT= Snapchat
Lines 23-33 GH_PROJECT= KeyDB Link Here
23	USE_RC_SUBR= keydb keydb_sentinel	25	USE_RC_SUBR= keydb keydb_sentinel
24		26
25	MAKE_ENV= OPTIMIZATION= \	27	MAKE_ENV= OPTIMIZATION= \
26	V=yo	28	V=1
27		29
28	CFLAGS+= -I${LOCALBASE}/include	30	LDFLAGS+= -lm -lexecinfo
29	LDFLAGS+= -lpthread -lm -lexecinfo -L${LOCALBASE}/lib
30		31
		32	EXTRACT_AFTER_ARGS= --exclude deps/linenoise
31	SUB_FILES= pkg-message	33	SUB_FILES= pkg-message
32	SUB_LIST= PORTNAME=${PORTNAME} \	34	SUB_LIST= PORTNAME=${PORTNAME} \
33	KEYDB_DBDIR=${KEYDB_DBDIR} \	35	KEYDB_DBDIR=${KEYDB_DBDIR} \
Lines 38-43 SUB_LIST= PORTNAME=${PORTNAME} \ Link Here
38	USERS= keydb	40	USERS= keydb
39	GROUPS= keydb	41	GROUPS= keydb
40		42
		43	KEYDB_DBDIR?= /var/db/keydb
		44	KEYDB_RUNDIR?= /var/run/keydb
		45	KEYDB_LOGDIR?= /var/log/keydb
		46
		47	BIN_FILES= keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
		48	keydb-sentinel keydb-server
		49
41	PLIST_SUB= KEYDB_DBDIR=${KEYDB_DBDIR} \	50	PLIST_SUB= KEYDB_DBDIR=${KEYDB_DBDIR} \
42	KEYDB_GROUP=${GROUPS} \	51	KEYDB_GROUP=${GROUPS} \
43	KEYDB_LOGDIR=${KEYDB_LOGDIR} \	52	KEYDB_LOGDIR=${KEYDB_LOGDIR} \
Lines 47-72 PLIST_SUB= KEYDB_DBDIR=${KEYDB_DBDIR} \ Link Here
47	OPTIONS_DEFINE= TLS	56	OPTIONS_DEFINE= TLS
48	OPTIONS_DEFAULT= TLS	57	OPTIONS_DEFAULT= TLS
49		58
50	TLS_DESC= Use TLS (openssl req.)	59	TLS_DESC= Use TLS (openssl req.)
51		60
52	TLS_USES= ssl	61	TLS_USES= ssl
53	TLS_MAKE_ENV= BUILD_TLS=yes	62	TLS_MAKE_ENV= BUILD_TLS=yes
54		63
55	BIN_FILES= keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
56	keydb-sentinel keydb-server
57
58	KEYDB_DBDIR?= /var/db/keydb
59	KEYDB_RUNDIR?= /var/run/keydb
60	KEYDB_LOGDIR?= /var/log/keydb
61
62	.include <bsd.port.pre.mk>	64	.include <bsd.port.pre.mk>
63		65
64	.if ${ARCH} == i386 && !${CFLAGS:M-march=*}	66	.if ${ARCH} == i386 && !defined(CPUTYPE)
65	# Needed for __atomic_fetch_add_8	67	#LIB_DEPENDS+=
66	USE_GCC= yes	68	CPUTYPE= pentium
67	CFLAGS+= -march=i586
68	.endif	69	.endif
69		70
		71	#.if ${ARCH} == i386 && !${CFLAGS:M-march=*}
		72	# Needed for __atomic_fetch_add_8
		73	#USE_GCC= yes
		74	#CFLAGS+= -march=i586
		75	#.endif
		76
70	.if defined(_ADDFLAGS)	77	.if defined(_ADDFLAGS)
71	CFLAGS+= -fPIC	78	CFLAGS+= -fPIC
72	LDFLAGS+= -Wl,-E	79	LDFLAGS+= -Wl,-E

Removed Link Here

(-)a/databases/keydb/files/patch-deps-linenoise-Makefile (-15 lines)
1	--- deps/linenoise/Makefile.orig 2019-09-25 10:40:18 UTC
2	+++ deps/linenoise/Makefile
3	@@ -1,10 +1,10 @@
4	STD=
5	WARN= -Wall
6	-OPT= -Os
7	+#OPT= -Os
8
9	R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
10	R_LDFLAGS= $(LDFLAGS)
11	-DEBUG= -g
12	+#DEBUG= -g
13
14	R_CC=$(CC) $(R_CFLAGS)
15	R_LD=$(CC) $(R_LDFLAGS)