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 5FB62138334 for ; Thu, 18 Apr 2019 05:12:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06683E0B1E; Thu, 18 Apr 2019 05:12:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 C56C0E0B1E for ; Thu, 18 Apr 2019 05:12:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 E30E33417E7 for ; Thu, 18 Apr 2019 05:12:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4C335B2 for ; Thu, 18 Apr 2019 05:11:58 +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: <1555564234.2b5acf19be8645e316cdd35f336a9b641a49e684.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-4.0.14.ebuild dev-db/redis/redis-5.0.4.ebuild X-VCS-Directories: dev-db/redis/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 2b5acf19be8645e316cdd35f336a9b641a49e684 X-VCS-Branch: master Date: Thu, 18 Apr 2019 05:11:58 +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: c9f8a831-dff8-470f-bb20-65dd8bff4aec X-Archives-Hash: f303f8c96caff35c674b3413f497ecb8 commit: 2b5acf19be8645e316cdd35f336a9b641a49e684 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Apr 18 05:08:23 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Apr 18 05:10:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5acf19 dev-db/redis: GitHub PR dropped slotted-Lua improvements Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> dev-db/redis/redis-4.0.14.ebuild | 21 +++++++++++++++++---- dev-db/redis/redis-5.0.4.ebuild | 20 +++++++++++++++++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dev-db/redis/redis-4.0.14.ebuild b/dev-db/redis/redis-4.0.14.ebuild index 5f2c18f61cb..08d29146a9b 100644 --- a/dev-db/redis/redis-4.0.14.ebuild +++ b/dev-db/redis/redis-4.0.14.ebuild @@ -71,15 +71,28 @@ 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" \ -e "/PKG_CHECK_MODULES.*\/s,lua5.1,${LUAPKGCONFIG},g" \ configure.ac || die "Sed failed for configure.ac" - eautoreconf } diff --git a/dev-db/redis/redis-5.0.4.ebuild b/dev-db/redis/redis-5.0.4.ebuild index 519fc3837ca..07c6466e9a1 100644 --- a/dev-db/redis/redis-5.0.4.ebuild +++ b/dev-db/redis/redis-5.0.4.ebuild @@ -71,9 +71,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" \