| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394 |
- $OpenBSD: patch-src_Makefile,v 1.26 2016/11/01 09:07:19 dcoppa Exp $
- --- src/Makefile.orig Wed Oct 26 09:17:45 2016
- +++ src/Makefile Tue Nov 1 10:03:38 2016
- @@ -14,8 +14,8 @@
-
- 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 geohash-int
- +# OPTIMIZATION?=-O2
- +DEPENDENCY_TARGETS=hiredis linenoise geohash-int
-
- # Default settings
- STD=-std=c99 -pedantic -DREDIS_STATIC=''
- @@ -24,6 +24,7 @@ OPT=$(OPTIMIZATION)
-
- PREFIX?=/usr/local
- INSTALL_BIN=$(PREFIX)/bin
- +INSTALL_SBIN=$(PREFIX)/sbin
- INSTALL=install
-
- # Default allocator
- @@ -56,7 +57,7 @@ endif
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- -DEBUG=-g -ggdb
- +# DEBUG=-g -ggdb
-
- ifeq ($(uname_S),SunOS)
- # SunOS
- @@ -90,7 +91,7 @@ endif
- endif
- endif
- # Include paths to dependencies
- -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
- +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I${MODLUA_INCL_DIR}
-
- ifeq ($(MALLOC),tcmalloc)
- FINAL_CFLAGS+= -DUSE_TCMALLOC
- @@ -112,6 +113,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-
- +ifndef INSTALL_DIR
- + INSTALL_DIR= mkdir -p
- +endif
- +
- CCCOLOR="\033[34m"
- LINKCOLOR="\033[34;1m"
- SRCCOLOR="\033[33m"
- @@ -127,7 +132,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 geo.o
- +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 geo.o fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_struct.o lua_cmsgpack.o
- REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
- @@ -182,7 +187,7 @@ endif
-
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
- - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
- + $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) -L${LOCALBASE}/lib ${MODLUA_LIB}
-
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
- @@ -222,7 +227,7 @@ distclean: clean
- .PHONY: distclean
-
- test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
- - @(cd ..; ./runtest)
- + @(cd ..; ulimit -Sn `ulimit -Hn`; ${TCL_BIN} tests/test_helper.tcl)
-
- test-sentinel: $(REDIS_SENTINEL_NAME)
- @(cd ..; ./runtest-sentinel)
- @@ -263,10 +268,11 @@ src/help.h:
- @../utils/generate-command-help.rb > help.h
-
- install: all
- - @mkdir -p $(INSTALL_BIN)
- - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
- + $(INSTALL_DIR) $(INSTALL_BIN)
- + $(INSTALL_DIR) $(INSTALL_SBIN)
- + $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_SBIN)
- $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
- $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)
- $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN)
- $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN)
- - @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
- + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_SBIN)/$(REDIS_SENTINEL_NAME)
|
