summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-deps-Makefile
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2021-10-27 09:52:31 -0400
committerSergey A. Osokin <osa@FreeBSD.org>2021-10-27 09:52:31 -0400
commit6378be71c3ac8724a5a0278ce3955886af148d3b (patch)
tree23529bbd8637699403a092763d7f80ee73072a03 /databases/redis-devel/files/patch-deps-Makefile
parentdevel/sonar-scanner-cli: fix CPE product (diff)
databases/redis-devel: update to the recent commit
Diffstat (limited to 'databases/redis-devel/files/patch-deps-Makefile')
-rw-r--r--databases/redis-devel/files/patch-deps-Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index cf77ec972392..54e63847811f 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,5 +1,5 @@
---- deps/Makefile.orig 2021-10-19 22:00:31.196463000 -0400
-+++ deps/Makefile 2021-10-19 22:00:41.781836000 -0400
+--- deps/Makefile.orig 2021-10-27 07:48:08.000000000 -0400
++++ deps/Makefile 2021-10-27 09:49:28.847356000 -0400
@@ -69,7 +69,7 @@
LUA_CFLAGS= -D__C99FEATURES__=1
endif
@@ -9,7 +9,7 @@
LUA_LDFLAGS+= $(LDFLAGS)
# 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
-@@ -79,16 +79,16 @@
+@@ -79,11 +79,11 @@
lua: .make-prerequisites
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
@@ -22,11 +22,14 @@
+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
JEMALLOC_LDFLAGS= $(LDFLAGS)
+ ifneq ($(DEB_HOST_GNU_TYPE),)
+@@ -92,7 +92,7 @@
+
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)"
+- 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)"
++ 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 && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc