ultrabug 14/08/07 08:26:48 Added: redis-2.8.13-sharedlua.patch Log: verion bump fix #515136 #518464 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Revision Changes Path 1.1 dev-db/redis/files/redis-2.8.13-sharedlua.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.8.13-sharedlua.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.8.13-sharedlua.patch?rev=1.1&content-type=text/plain Index: redis-2.8.13-sharedlua.patch =================================================================== commit de0d4973ddb629dcc80f0724769a0e997fe644ba Author: Johan Bergström <b...@bergstroem.nu> Date: Wed Jul 16 09:47:44 2014 +1000 Use a shared lua diff --git src/Makefile src/Makefile index 134694c..a09832e 100644 --- src/Makefile +++ src/Makefile @@ -15,7 +15,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') OPTIMIZATION?=-O2 -DEPENDENCY_TARGETS=hiredis linenoise lua +DEPENDENCY_TARGETS=hiredis linenoise # Default settings STD=-std=c99 -pedantic @@ -52,6 +52,7 @@ endif FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm +FINAL_LIBS+=$(shell pkg-config --libs lua) DEBUG=-g -ggdb ifeq ($(uname_S),SunOS) @@ -108,6 +109,7 @@ endif REDIS_SERVER_NAME=redis-server REDIS_SENTINEL_NAME=redis-sentinel REDIS_SERVER_OBJ=adlist.o ae.o anet.o dict.o redis.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 migrate.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 hyperloglog.o latency.o sparkline.o +REDIS_SERVER_OBJ+=lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o REDIS_CLI_NAME=redis-cli REDIS_CLI_OBJ=anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o REDIS_BENCHMARK_NAME=redis-benchmark @@ -162,7 +164,7 @@ endif # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) + $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) # redis-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
