mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-db/redis: bump to 5.0.5
Fixes: https://github.com/gentoo/gentoo/pull/12372 Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com> Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
Tomas Mozes
committed by
Robin H. Johnson
Robin H. Johnson
parent
3e097ee793
commit
17588ea893
@@ -6,3 +6,4 @@ DIST redis-4.0.14.tar.gz 1740967 BLAKE2B d9122565ba890416d8936db936bc1410af840cc
|
||||
DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5a5b6afb725cb87934fbcb62107085671fd1072d1142ce8e92f069e6b6064c9f4468335bc6997897c8f494471 SHA512 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
|
||||
DIST redis-5.0.3.tar.gz 1959445 BLAKE2B d1c3247d77aa3b1076d0e1a0dcce74dcfb14a0ad3776603ef8154d7868f9f3efcf2138cb08581eee1974e9d76658d07456d6e9795391321b1f1f8bca7f9d40f5 SHA512 5915b14502438bf7c3f56e38640dda54b095bd87501aefa6e386c9cef48e8d1e625e980643d128d91b8cab26dd51d5d99ca66fa638dc04e5ba315fe43f11f58b
|
||||
DIST redis-5.0.4.tar.gz 1966337 BLAKE2B 9195e970d7c987c2540da3a89f4fc33620f6a45ed243fa24715fe20f174d5e569e5ff940834176b3f26b13d9cca95f1d2914d65ad71f295787553c6bb8552089 SHA512 336929c81a476e2a23a64f867823d70c3aab66fb0098eef2e61630be6522ff2f6af680169ffcae35d559758b2c6b56f88c5a953a538291fea886449cba33b8ad
|
||||
DIST redis-5.0.5.tar.gz 1975750 BLAKE2B 3a0463685ae30f9d38e96d7324ae624474f02311e22e186460834920babc35ff343d84e8cb78a2cee0d45d9ba1c01944c783c88892b6580d83bc1cdec64a3e94 SHA512 78215ec02b7184e05788c7a368146ea53095a877a0e09174b4c9f175aeb9ba9174023c19e33bf62e4513b848e1841538d398e7c0a651c5c947255c1691cb4586
|
||||
|
||||
155
dev-db/redis/redis-5.0.5.ebuild
Normal file
155
dev-db/redis/redis-5.0.5.ebuild
Normal file
@@ -0,0 +1,155 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools flag-o-matic systemd toolchain-funcs user
|
||||
|
||||
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 tcmalloc luajit 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.
|
||||
RDEPEND="
|
||||
luajit? ( dev-lang/luajit:2 )
|
||||
!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
|
||||
tcmalloc? ( dev-util/google-perftools )
|
||||
jemalloc? ( >=dev-libs/jemalloc-5.1:= )"
|
||||
|
||||
BDEPEND="
|
||||
${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
# Tcl is only needed in the CHOST test env
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-lang/tcl:0= )"
|
||||
|
||||
REQUIRED_USE="?? ( tcmalloc jemalloc )"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup redis 75
|
||||
enewuser redis 75 -1 /var/lib/redis redis
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
eapply \
|
||||
"${FILESDIR}"/${PN}-3.2.3-config.patch \
|
||||
"${FILESDIR}"/${PN}-5.0-shared.patch \
|
||||
"${FILESDIR}"/${PN}-5.0-sharedlua.patch \
|
||||
"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
|
||||
eapply_user
|
||||
|
||||
# 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)
|
||||
|
||||
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
|
||||
# also, don't define ANSI/c99 for lua twice
|
||||
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export CC AR RANLIB
|
||||
|
||||
local myconf=""
|
||||
|
||||
if use tcmalloc; then
|
||||
myconf="${myconf} USE_TCMALLOC=yes"
|
||||
elif use jemalloc; then
|
||||
myconf="${myconf} JEMALLOC_SHARED=yes"
|
||||
else
|
||||
myconf="${myconf} MALLOC=yes"
|
||||
fi
|
||||
|
||||
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user