diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-10-01 01:28:14 +0000 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-10-01 01:31:53 +0000 |
| commit | c744924155c8d71fda874a339fd48388fece5cae (patch) | |
| tree | deb165b57aa98d4b8fe190642fd0e615bd3a6f56 | |
| parent | 114c68fa889ae20e8f61123e229fddb911f08284 (diff) | |
| download | ports-c744924155c8d71fda874a339fd48388fece5cae.tar.gz ports-c744924155c8d71fda874a339fd48388fece5cae.zip | |
databases/redis-devel: Update to latest snapshot
| -rw-r--r-- | databases/redis-devel/Makefile | 6 | ||||
| -rw-r--r-- | databases/redis-devel/distinfo | 6 | ||||
| -rw-r--r-- | databases/redis-devel/files/patch-src-Makefile | 28 |
3 files changed, 20 insertions, 20 deletions
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 47e5d0ee712d..a859cc742bf1 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis -DISTVERSION= 7.4.0.20240911 +DISTVERSION= 7.4.0.20240929 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -18,7 +18,7 @@ LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES+= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs USE_GITHUB= yes -GH_TAGNAME= 2dd4cca36 +GH_TAGNAME= d092d64d7 USE_RC_SUBR= redis sentinel MAKE_ENV= OPTIMIZATION= \ @@ -64,7 +64,7 @@ REDIS_RUNDIR?= /var/run/redis REDIS_LOGDIR?= /var/log/redis post-patch-JEMALLOC-on: - @${REINPLACE_CMD} '72s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} '78s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index ae9e94787fbf..f1954c36012c 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726101194 -SHA256 (redis-redis-7.4.0.20240911-2dd4cca36_GH0.tar.gz) = 9f9f7190e118fad36201f0b55ea181f5ead78774e2ccb24ea31f195d592e7750 -SIZE (redis-redis-7.4.0.20240911-2dd4cca36_GH0.tar.gz) = 3576212 +TIMESTAMP = 1727745776 +SHA256 (redis-redis-7.4.0.20240929-d092d64d7_GH0.tar.gz) = 1b9c4ff5d4d29831e091ace324dd4facf167d3f45f55257d06f74c8bbf1f35e7 +SIZE (redis-redis-7.4.0.20240929-d092d64d7_GH0.tar.gz) = 3626513 diff --git a/databases/redis-devel/files/patch-src-Makefile b/databases/redis-devel/files/patch-src-Makefile index 6b3ed47b68be..01e7febdcc7e 100644 --- a/databases/redis-devel/files/patch-src-Makefile +++ b/databases/redis-devel/files/patch-src-Makefile @@ -1,25 +1,25 @@ ---- src/Makefile.orig 2019-11-29 16:35:59 UTC +--- src/Makefile.orig 2024-09-29 06:13:21 UTC +++ src/Makefile -@@ -29,7 +29,7 @@ endif - WARN=-Wall -W -Wno-missing-field-initializers - OPT=$(OPTIMIZATION) +@@ -64,7 +64,7 @@ endif + STD+=-std=c99 + endif -PREFIX?=/usr/local +PREFIX:=$(PREFIX) INSTALL_BIN=$(PREFIX)/bin INSTALL=install - -@@ -75,7 +75,6 @@ endif + PKG_CONFIG?=pkg-config +@@ -128,7 +128,6 @@ FINAL_LIBS=-lm -lstdc++ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm + FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm -lstdc++ -DEBUG=-g -ggdb - # Linux ARM needs -latomic at linking time - ifneq (,$(filter aarch64 armv,$(uname_M))) -@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) - OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include - OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib + # Linux ARM32 needs -latomic at linking time + ifneq (,$(findstring armv,$(uname_M))) +@@ -167,6 +166,11 @@ else + OPENSSL_PREFIX?=/usr/local/opt/openssl + endif else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -131,6 +135,7 @@ else +@@ -216,6 +220,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt |