From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA942138334 for ; Mon, 25 Mar 2019 04:18:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0FF8E08A5; Mon, 25 Mar 2019 04:18:25 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86351E08A5 for ; Mon, 25 Mar 2019 04:18:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D87AF335C6F for ; Mon, 25 Mar 2019 04:18:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BED88565 for ; Mon, 25 Mar 2019 04:18:21 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1553487493.aade4eec718e2d85152a668be8c12be841c166c0.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/redis/redis-5.0.3.ebuild X-VCS-Directories: dev-db/redis/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: aade4eec718e2d85152a668be8c12be841c166c0 X-VCS-Branch: master Date: Mon, 25 Mar 2019 04:18:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f5e8b0e-2912-419b-80d1-19138fd3eb2c X-Archives-Hash: 214d1cd16bbf5c2320101769fb8c0987 commit: aade4eec718e2d85152a668be8c12be841c166c0 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 25 04:13:48 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 25 04:18:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aade4eec 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 gentoo.org> dev-db/redis/redis-5.0.3.ebuild | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dev-db/redis/redis-5.0.3.ebuild b/dev-db/redis/redis-5.0.3.ebuild index 2b13aad0139..c584f33c21f 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" \