diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-05 21:17:31 +0100 |
| commit | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch) | |
| tree | c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /dev-db/redis | |
| parent | 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff) | |
gentoo resync : 05.04.2019
Diffstat (limited to 'dev-db/redis')
| -rw-r--r-- | dev-db/redis/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/redis/redis-5.0.3.ebuild | 22 |
2 files changed, 19 insertions, 5 deletions
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 067bd698ab3b..141c49db91d2 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -24,5 +24,5 @@ EBUILD redis-4.0.11.ebuild 4074 BLAKE2B 609631167471b07d3caccad80d601e4d73a594a9 EBUILD redis-4.0.12.ebuild 4071 BLAKE2B 712cefef53f55c9e60a1461a5bc843866fdf60815ecb42675b929b6b4fdd98dc270fa3544e6739ce22616f5f5a15efac7ecb4f78a910271bb15acaeacde07516 SHA512 2df15597298b24a7c2f317ce52d9efdb810a558da8f40902cda5865e43a8f59d699f0c92f025bfdfae183ac6b019eb0ad130a745ace48d8865a9642c0bacd7c1 EBUILD redis-4.0.13.ebuild 4071 BLAKE2B ce447abe1db2a9bf75fb506cb910a0906447ddd64d251907a4a4fce753189c41c7b42938a97f716169eae19d1868440bdc4b993b937dc896124f025df0453a85 SHA512 40b346d0d67fdc1f8fa5d80b3c502230b78a59ec9a2242e87c0091bd18ae33a76904ab1ccff4a197b867a7a3bdfd6d7462db93b127f59f628aa01e1bce3b098e EBUILD redis-4.0.2-r1.ebuild 3807 BLAKE2B 7dbd27ad7593b53f1f7184321ba33f140072ef946859b33cf8dacf7eb98c9d7398c512ce403132bf3b9fece12e73cc0e4dd5cca1dbc220d50dea105ea87ef774 SHA512 d7744c01cbf4b6f1fec17ce7733a31f4deb3e925afbafb3a9aaa360d9598aff78b44c3bcadc54e82c809ff6ba0211e475d32f96ec4244f6081e3f5cfde1b1daa -EBUILD redis-5.0.3.ebuild 4011 BLAKE2B b99054eb7a1cf93cfd293b4884098eb12e41564f2505ba49d179c824a7e78a236f03f31198d3073ea882c6df327f2d5668f4e043632da55b5a25ef2c865000d6 SHA512 cf61adaa5d6e003abdd5e507f9d540699fe5d3ef593a1cd63507de9e8475a44265ad2385fb8f794e11f3f0908509b8552748f5280810a5ae2bc2d84d41110a16 +EBUILD redis-5.0.3.ebuild 4559 BLAKE2B c7c725eb0117a509f8e56c8d57bbf64cc1970e6e90819f284cd3b5c982a3400d53be7dd3c3552001dffd6ef6440d8164ccb3b2a4e76613388a4b50e541e9eb2a SHA512 36ddfc7f091e48daee3b7c3ff7230a6b1137fd143a40c861597699071941262b1d7575c1141c1fa0783df0f09a42381112d77a88e6d16d10fb712b218a50ae6d MISC metadata.xml 440 BLAKE2B b853160a8483ff59c413a37b8fd1703283cc80c5ea9de092654dd1809bdc6ed3dc98fb6285a3f33bfea136bdf3db4065b3e22c34f7458e9e83aa63e137a13eb3 SHA512 7c125eed761e5f4c868a3fd5539d5182b9c4da6ddeb0cb82a46dc6d0cc682410eb100168ddb4b5fb214d6092395394cefef5bc8fd3dcce818542d30748f9bd17 diff --git a/dev-db/redis/redis-5.0.3.ebuild b/dev-db/redis/redis-5.0.3.ebuild index 2b13aad0139e..c584f33c21fc 100644 --- a/dev-db/redis/redis-5.0.3.ebuild +++ b/dev-db/redis/redis-5.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -68,9 +68,23 @@ src_prepare() { cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die # Use the correct pkgconfig name for Lua - has_version 'dev-lang/lua:5.1' \ - && LUAPKGCONFIG=lua5.1 \ - || LUAPKGCONFIG=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" \ |