summaryrefslogtreecommitdiff
path: root/databases/redis/files/patch-deps-Makefile
diff options
context:
space:
mode:
authorYasuhiro Kimura <yasu@FreeBSD.org>2023-03-23 18:04:23 +0900
committerYasuhiro Kimura <yasu@FreeBSD.org>2023-08-17 12:30:49 +0900
commit6457315e54301694a06d125c1020a941fc5ea9dc (patch)
tree6f34a498cdc1ce571964d65b7df6fcd510c85ad4 /databases/redis/files/patch-deps-Makefile
parentdatabases/redis*: Update CONFLICTS_INSTALL, remove CONFLICTS (diff)
databases/redis: Update to 7.2.0
* Add entry to UPDATING. * Pet portclippy. ReleaseNotes: https://github.com/redis/redis/blob/7.2.0/00-RELEASENOTES
Diffstat (limited to 'databases/redis/files/patch-deps-Makefile')
-rw-r--r--databases/redis/files/patch-deps-Makefile25
1 files changed, 8 insertions, 17 deletions
diff --git a/databases/redis/files/patch-deps-Makefile b/databases/redis/files/patch-deps-Makefile
index 21331efe7d8a..33e36467dbca 100644
--- a/databases/redis/files/patch-deps-Makefile
+++ b/databases/redis/files/patch-deps-Makefile
@@ -1,30 +1,21 @@
---- deps/Makefile.orig 2021-12-01 15:06:05 UTC
+--- deps/Makefile.orig 2023-07-10 11:55:20 UTC
+++ deps/Makefile
-@@ -76,7 +76,7 @@
+@@ -84,7 +84,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
ifeq ($(LUA_DEBUG),yes)
LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
else
- LUA_CFLAGS+= -O2
+ LUA_CFLAGS+=
endif
- # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
- # challenging to cross-compile lua (and redis). These defines make it easier
-@@ -90,7 +90,7 @@
-
- .PHONY: lua
-
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
-
- ifneq ($(DEB_HOST_GNU_TYPE),)
-@@ -99,7 +99,7 @@
+ ifeq ($(LUA_COVERAGE),yes)
+ LUA_CFLAGS += -fprofile-arcs -ftest-coverage
+@@ -112,7 +112,7 @@ endif
jemalloc: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-- cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
-- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+ cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+- cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+- cd jemalloc && $(MAKE) lib/libjemalloc.a
++ cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+ cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc