mirror of
https://git.freebsd.org/ports.git
synced 2025-06-15 09:40:35 -04:00
27e36df36a
* Mark BROKEN if any of external lua library options are enabled. Upstream add new APIs to bundled lua library and use them in source code of redis. This makes it impossible to compile and link redis with external lua libraries. According to the commit message of upstream repository they took the code of new API from the repository of lua. It means linking with external lua libraries may get possible again if they are updated. So mark BROKEN rather than remove these options. * Update CONFLICTS of databases/redis*. * Switch to DISTVERSION. * Pet portlint and portclippy. * Tidy up Makefile with portfmt. ChangeLog: https://github.com/redis/redis/releases/tag/7.0.0 Security: cc42db1c-c65f-11ec-ad96-0800270512f4
58 lines
3 KiB
Lua
58 lines
3 KiB
Lua
--- src/Makefile.orig 2022-01-11 16:00:14 UTC
|
|
+++ src/Makefile
|
|
@@ -16,7 +16,7 @@
|
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
|
OPTIMIZATION?=-O2
|
|
-DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
|
|
+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
|
|
NODEPS:=clean distclean
|
|
|
|
# Default settings
|
|
@@ -115,8 +115,8 @@
|
|
# Override default settings if possible
|
|
-include .make-settings
|
|
|
|
-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
|
-FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
|
|
+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
|
|
+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
|
|
FINAL_LIBS=-lm
|
|
|
|
# Linux ARM32 needs -latomic at linking time
|
|
@@ -227,7 +227,7 @@
|
|
endif
|
|
|
|
# Include paths to dependencies
|
|
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
|
|
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
|
|
|
|
# Determine systemd support and/or build preference (defaulting to auto-detection)
|
|
BUILD_WITH_SYSTEMD=no
|
|
@@ -301,6 +301,9 @@
|
|
endef
|
|
endif
|
|
|
|
+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
|
|
+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
|
|
+
|
|
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
|
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
|
|
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
|
|
@@ -322,6 +325,7 @@
|
|
REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
|
|
REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
|
|
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 eval.o bio.o rio.o rand.o memtest.o crcspeed.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 lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o
|
|
+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
|
|
REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
|
|
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
|
|
REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
|
|
@@ -375,7 +379,7 @@
|
|
|
|
# redis-server
|
|
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
|
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS)
|
|
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS)
|
|
|
|
# redis-sentinel
|
|
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
|