Attachment 245898 Details for Bug 274745 – Patch for keydb

[patch] Patch for keydb

keydb-fixup.patch (text/plain), 5.77 KB, created by Daniel Engberg on 2023-10-26 18:28:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2023-10-26 18:28:08 UTC

Size: 5.77 KB

patch

obsolete

>diff --git a/databases/keydb/Makefile b/databases/keydb/Makefile
>index 95561180b69b..2b7c1a39ea7b 100644
>--- a/databases/keydb/Makefile
>+++ b/databases/keydb/Makefile
>@@ -4,7 +4,7 @@ DISTVERSION=	6.3.3
> CATEGORIES=	databases
> 
> MAINTAINER=	zi@FreeBSD.org
>-COMMENT=	High performance fork of Redis--a persistent key-value database
>+COMMENT=	High performance persistent key-value database
> WWW=		https://docs.keydb.dev/
> 
> LICENSE=	BSD3CLAUSE
>@@ -13,9 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
> 		liblz4.so:archivers/liblz4 \
> 		libsnappy.so:archivers/snappy \
>-		libzstd.so:archivers/zstd
>+		libzstd.so:archivers/zstd \
>+		liblinenoise.so:devel/linenoise
> 
>-USES=		compiler:c11 cpe gmake pkgconfig:build tcl:test
>+USES=		compiler:c++14-lang cpe gmake localbase:ldflags pkgconfig \
>+		tcl:test
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	Snapchat
>@@ -23,11 +25,11 @@ GH_PROJECT=	KeyDB
> USE_RC_SUBR=	keydb keydb_sentinel
> 
> MAKE_ENV=	OPTIMIZATION= \
>-		V=yo
>+		V=1
> 
>-CFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-lpthread -lm -lexecinfo -L${LOCALBASE}/lib
>+LDFLAGS+=	-lm -lexecinfo
> 
>+EXTRACT_AFTER_ARGS=	 --exclude deps/linenoise
> SUB_FILES=	pkg-message
> SUB_LIST=	PORTNAME=${PORTNAME} \
> 		KEYDB_DBDIR=${KEYDB_DBDIR} \
>@@ -38,6 +40,13 @@ SUB_LIST=	PORTNAME=${PORTNAME} \
> 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} \
>@@ -47,26 +56,24 @@ PLIST_SUB=	KEYDB_DBDIR=${KEYDB_DBDIR} \
> OPTIONS_DEFINE=		TLS
> OPTIONS_DEFAULT=	TLS
> 
>-TLS_DESC=	Use TLS (openssl req.)
>+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 && !${CFLAGS:M-march=*}
>-# Needed for __atomic_fetch_add_8
>-USE_GCC=	yes
>-CFLAGS+=	-march=i586
>+.if ${ARCH} == i386 && !defined(CPUTYPE)
>+#LIB_DEPENDS+=	
>+CPUTYPE=	pentium
> .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
>diff --git a/databases/keydb/files/patch-deps-linenoise-Makefile b/databases/keydb/files/patch-deps-linenoise-Makefile
>deleted file mode 100644
>index aef0f10966af..000000000000
>--- a/databases/keydb/files/patch-deps-linenoise-Makefile
>+++ /dev/null
>@@ -1,15 +0,0 @@
>---- 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)
>diff --git a/databases/keydb/files/patch-deps_Makefile b/databases/keydb/files/patch-deps_Makefile
>index f5352bbfde00..644da5e84992 100644
>--- a/databases/keydb/files/patch-deps_Makefile
>+++ b/databases/keydb/files/patch-deps_Makefile
>@@ -1,7 +1,10 @@
>---- deps/Makefile.orig	2023-10-25 17:16:24 UTC
>+--- deps/Makefile.orig	2023-04-20 22:17:21 UTC
> +++ deps/Makefile
>-@@ -38,7 +38,6 @@ distclean:
>- 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
>+@@ -35,10 +35,8 @@ endif
>+ 
>+ distclean:
>+ 	-(cd hiredis && $(MAKE) clean) > /dev/null || true
>+-	-(cd linenoise && $(MAKE) clean) > /dev/null || true
>  	-(cd lua && $(MAKE) clean) > /dev/null || true
>  	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
> -	-(cd rocksdb && $(MAKE) clean) > /dev/null || true
>diff --git a/databases/keydb/files/patch-src-Makefile b/databases/keydb/files/patch-src-Makefile
>index 4703d6eb6daf..9f6d339b62c6 100644
>--- a/databases/keydb/files/patch-src-Makefile
>+++ b/databases/keydb/files/patch-src-Makefile
>@@ -1,5 +1,14 @@
>---- src/Makefile.orig	2023-10-25 15:47:51 UTC
>+--- src/Makefile.orig	2023-04-20 22:17:21 UTC
> +++ src/Makefile
>+@@ -20,7 +20,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
>+ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
>+ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
>+ OPTIMIZATION?=-O2 -flto
>+-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
>++DEPENDENCY_TARGETS=hiredis lua hdr_histogram
>+ NODEPS:=clean distclean
>+ 
>+ # Default settings
> @@ -138,21 +138,11 @@ endif	
>  # Override default settings if possible
>  -include .make-settings
>@@ -33,6 +42,17 @@
>  else
>  ifeq ($(uname_S),DragonFly)
>  	# DragonFly
>+@@ -259,8 +251,8 @@ ifdef OPENSSL_PREFIX
>+ endif
>+ 
>+ # Include paths to dependencies
>+-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
>+-FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
>++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/lua/src -I../deps/hdr_histogram
>++FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
>+ 
>+ # Determine systemd support and/or build preference (defaulting to auto-detection)
>+ BUILD_WITH_SYSTEMD=no
> @@ -347,7 +339,7 @@ else
>  endif
>  
>@@ -50,3 +70,12 @@
>  	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
>  
>  .PHONY: persist-settings
>+@@ -453,7 +444,7 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME)
>+ 
>+ # keydb-cli
>+ $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
>+-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)
>++	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a -llinenoise $(FINAL_LIBS)
>+ 
>+ # keydb-benchmark
>+ $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)

Actions: View | Diff

Attachments on bug 274745: 245898