forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Tomáš Mózes <[email protected]> Closes: gentoo#15924 Signed-off-by: Thomas Deutschmann <[email protected]>
- Loading branch information
1 parent
5efe613
commit cd593a6
Showing
3 changed files
with
221 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c | ||
index c26c0d7..fa50c41 100644 | ||
--- a/deps/lua/src/lua_cjson.c | ||
+++ b/deps/lua/src/lua_cjson.c | ||
@@ -46,7 +46,7 @@ | ||
#include "strbuf.h" | ||
#include "fpconv.h" | ||
|
||
-#include "../../../src/solarisfixes.h" | ||
+#include "solarisfixes.h" | ||
|
||
#ifndef CJSON_MODNAME | ||
#define CJSON_MODNAME "cjson" | ||
diff --git a/src/Makefile b/src/Makefile | ||
index b8c05c3..e5a7cc2 100644 | ||
--- a/src/Makefile | ||
+++ b/src/Makefile | ||
@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') | ||
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 | ||
+DEPENDENCY_TARGETS=hiredis linenoise | ||
NODEPS:=clean distclean | ||
|
||
# Default settings | ||
@@ -76,6 +76,7 @@ endif | ||
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | ||
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) | ||
FINAL_LIBS=-lm | ||
+FINAL_LIBS+=@LUA_LIBS@ | ||
DEBUG=-g -ggdb | ||
|
||
# Linux ARM needs -latomic at linking time | ||
@@ -149,7 +150,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 @LUA_CFLAGS@ | ||
|
||
# Determine systemd support and/or build preference (defaulting to auto-detection) | ||
BUILD_WITH_SYSTEMD=no | ||
@@ -217,6 +218,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 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 gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o | ||
+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o | ||
REDIS_CLI_NAME=redis-cli | ||
REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o | ||
REDIS_BENCHMARK_NAME=redis-benchmark | ||
@@ -268,7 +270,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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,160 @@ | ||
# Copyright 1999-2020 Gentoo Authors | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=7 | ||
|
||
inherit autotools flag-o-matic systemd toolchain-funcs | ||
|
||
DESCRIPTION="A persistent caching system, key-value and data structures database" | ||
HOMEPAGE="https://redis.io" | ||
SRC_URI="http://download.redis.io/releases/${P}.tar.gz" | ||
|
||
LICENSE="BSD" | ||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" | ||
IUSE="+jemalloc luajit tcmalloc test" | ||
RESTRICT="!test? ( test )" | ||
SLOT="0" | ||
|
||
# Redis does NOT build with Lua 5.2 or newer at this time. | ||
# This should link correctly with both unslotted & slotted Lua, without | ||
# changes. | ||
COMMON_DEPEND=" | ||
jemalloc? ( >=dev-libs/jemalloc-5.1:= ) | ||
luajit? ( dev-lang/luajit:2 ) | ||
!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) | ||
tcmalloc? ( dev-util/google-perftools ) | ||
" | ||
|
||
RDEPEND=" | ||
${COMMON_DEPEND} | ||
acct-group/redis | ||
acct-user/redis | ||
" | ||
|
||
BDEPEND=" | ||
${COMMON_DEPEND} | ||
virtual/pkgconfig | ||
" | ||
|
||
# Tcl is only needed in the CHOST test env | ||
DEPEND=" | ||
${COMMON_DEPEND} | ||
test? ( dev-lang/tcl:0= )" | ||
|
||
REQUIRED_USE="?? ( jemalloc tcmalloc )" | ||
|
||
PATCHES=( | ||
"${FILESDIR}"/${PN}-3.2.3-config.patch | ||
"${FILESDIR}"/${PN}-5.0-shared.patch | ||
"${FILESDIR}"/${PN}-6.0.3-sharedlua.patch | ||
"${FILESDIR}"/${PN}-5.0.8-ppc-atomic.patch | ||
"${FILESDIR}"/${PN}-sentinel-5.0-config.patch | ||
) | ||
|
||
src_prepare() { | ||
default | ||
|
||
# unstable on jemalloc | ||
> tests/unit/memefficiency.tcl || die | ||
|
||
# Copy lua modules into build dir | ||
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die | ||
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die | ||
# Append cflag for lua_cjson | ||
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 | ||
append-cflags "-DENABLE_CJSON_GLOBAL" | ||
|
||
# now we will rewrite present Makefiles | ||
local makefiles="" MKF | ||
for MKF in $(find -name 'Makefile' | cut -b 3-); do | ||
mv "${MKF}" "${MKF}.in" | ||
sed -i -e 's:$(CC):@CC@:g' \ | ||
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \ | ||
-e 's: $(DEBUG)::g' \ | ||
-e 's:$(OBJARCH)::g' \ | ||
-e 's:ARCH:TARCH:g' \ | ||
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \ | ||
"${MKF}.in" \ | ||
|| die "Sed failed for ${MKF}" | ||
makefiles+=" ${MKF}" | ||
done | ||
# autodetection of compiler and settings; generates the modified Makefiles | ||
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die | ||
|
||
# Use the correct pkgconfig name for Lua | ||
if false && has_version 'dev-lang/lua:5.3'; then | ||
# Lua5.3 gives: | ||
#lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" | ||
LUAPKGCONFIG=lua5.3 | ||
elif false && has_version 'dev-lang/lua:5.2'; then | ||
# Lua5.2 fails with: | ||
# scripting.c:(.text+0x1f9b): undefined reference to `lua_open' | ||
# Because lua_open because lua_newstate in 5.2 | ||
LUAPKGCONFIG=lua5.2 | ||
elif has_version 'dev-lang/lua:5.1'; then | ||
LUAPKGCONFIG=lua5.1 | ||
else | ||
LUAPKGCONFIG=lua | ||
fi | ||
# The upstream configure script handles luajit specially, and is not | ||
# effected by these changes. | ||
einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" | ||
sed -i \ | ||
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ | ||
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ | ||
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ | ||
configure.ac || die "Sed failed for configure.ac" | ||
eautoreconf | ||
} | ||
|
||
src_configure() { | ||
econf $(use_with luajit) | ||
} | ||
|
||
src_compile() { | ||
local myconf="" | ||
|
||
if use jemalloc; then | ||
myconf+="MALLOC=jemalloc" | ||
elif use tcmalloc; then | ||
myconf+="MALLOC=tcmalloc" | ||
else | ||
myconf+="MALLOC=libc" | ||
fi | ||
|
||
tc-export CC | ||
emake V=1 ${myconf} CC="${CC}" | ||
} | ||
|
||
src_install() { | ||
insinto /etc/ | ||
doins redis.conf sentinel.conf | ||
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf | ||
fperms 0644 /etc/{redis,sentinel}.conf | ||
|
||
newconfd "${FILESDIR}/redis.confd-r1" redis | ||
newinitd "${FILESDIR}/redis.initd-5" redis | ||
|
||
systemd_newunit "${FILESDIR}/redis.service-3" redis.service | ||
systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles-2" redis.conf | ||
|
||
newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel | ||
newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel | ||
|
||
insinto /etc/logrotate.d/ | ||
newins "${FILESDIR}/${PN}.logrotate" ${PN} | ||
|
||
dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md | ||
|
||
dobin src/redis-cli | ||
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb | ||
fperms 0750 /usr/sbin/redis-benchmark | ||
dosym redis-server /usr/sbin/redis-sentinel | ||
|
||
if use prefix; then | ||
diropts -m0750 | ||
else | ||
diropts -m0750 -o redis -g redis | ||
fi | ||
keepdir /var/{log,lib}/redis | ||
} |