summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mozes <hydrapolic@gmail.com>2018-08-27 07:30:39 +0200
committerRobin H. Johnson <robbat2@gentoo.org>2018-09-05 14:19:53 -0700
commit9638f65d0442ee6ceb72fbf845e645bcffa7a1be (patch)
treecd565f134c99809834e78541d4e92684e9aa6cc5 /dev-db/redis/files
parentmedia-sound/chuck: Drop 1.3.5.1 (diff)
downloadgentoo-9638f65d0442ee6ceb72fbf845e645bcffa7a1be.tar.gz
gentoo-9638f65d0442ee6ceb72fbf845e645bcffa7a1be.tar.bz2
gentoo-9638f65d0442ee6ceb72fbf845e645bcffa7a1be.zip
dev-db/redis: re-add -lm for luajit
Closes: https://bugs.gentoo.org/664648 Package-Manager: Portage-2.3.45, Repoman-2.3.10 (cherry picked from commit 159e0c2bca9bc8b1ba4f6134097faaef7d3e5b25) Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/9706
Diffstat (limited to 'dev-db/redis/files')
-rw-r--r--dev-db/redis/files/redis-5.0-sharedlua.patch15
1 files changed, 7 insertions, 8 deletions
diff --git a/dev-db/redis/files/redis-5.0-sharedlua.patch b/dev-db/redis/files/redis-5.0-sharedlua.patch
index 3b97f913c604..76971cf4571e 100644
--- a/dev-db/redis/files/redis-5.0-sharedlua.patch
+++ b/dev-db/redis/files/redis-5.0-sharedlua.patch
@@ -12,7 +12,7 @@ index c26c0d7..fa50c41 100644
#ifndef CJSON_MODNAME
#define CJSON_MODNAME "cjson"
diff --git a/src/Makefile b/src/Makefile
-index 6f12a20..205cd59 100644
+index f5525bd..cecd8d0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
@@ -24,16 +24,15 @@ index 6f12a20..205cd59 100644
NODEPS:=clean distclean
# Default settings
-@@ -58,7 +58,7 @@ endif
-
+@@ -66,6 +66,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
--FINAL_LIBS=-lm
-+FINAL_LIBS=@LUA_LIBS@
+ FINAL_LIBS=-lm
++FINAL_LIBS+=@LUA_LIBS@
DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS)
-@@ -100,7 +100,7 @@ endif
+@@ -107,7 +108,7 @@ endif
endif
endif
# Include paths to dependencies
@@ -42,7 +41,7 @@ index 6f12a20..205cd59 100644
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -137,6 +137,7 @@ endif
+@@ -145,6 +146,7 @@ endif
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o
@@ -50,7 +49,7 @@ index 6f12a20..205cd59 100644
REDIS_CLI_NAME=redis-cli
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -188,7 +189,7 @@ endif
+@@ -196,7 +198,7 @@ endif
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)