From aade4eec718e2d85152a668be8c12be841c166c0 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 24 Mar 2019 21:13:48 -0700 Subject: dev-db/redis: early Lua-5.[23] support This enables easier testing of Lua 5.2 & Lua 5.3 support in Redis. It's blocked behind 'if false' at the moment, because it's clear the upstream Redis doesn't entirely support it yet. Failure messages logged in the ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Robin H. Johnson --- dev-db/redis/redis-5.0.3.ebuild | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'dev-db/redis') 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" \ -- cgit v1.2.3-65-gdbad