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 2DA891396D0 for ; Sun, 8 Oct 2017 23:24:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E2B6E0F3A; Sun, 8 Oct 2017 23:24:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 29AD0E0F3A for ; Sun, 8 Oct 2017 23:24:39 +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 519A933D3C7 for ; Sun, 8 Oct 2017 23:24:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A522A909B for ; Sun, 8 Oct 2017 23:24:36 +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: <1507505044.8793ede2340493fd21a82a50df2b0f49bdba598a.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.2.ebuild X-VCS-Directories: dev-db/redis/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8793ede2340493fd21a82a50df2b0f49bdba598a X-VCS-Branch: master Date: Sun, 8 Oct 2017 23:24:36 +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-Archives-Salt: acfcf776-0afe-4ee0-94b1-1bc601e9fd63 X-Archives-Hash: a0d0c3b58c2f97258b30b23972b7b7e7 commit: 8793ede2340493fd21a82a50df2b0f49bdba598a Author: Robin H. Johnson gentoo org> AuthorDate: Sun Oct 8 23:21:58 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Oct 8 23:24:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8793ede2 dev-db/redis: repeat Lua slotted+unslotted fixes. Re-apply the fixes from 5d58e071d2fe843bea503d3cd95998e95247aa39 that support both slotted & unslotted lua from a single ebuild. Signed-off-by: Robin H. Johnson gentoo.org> dev-db/redis/redis-4.0.2.ebuild | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-db/redis/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2.ebuild index c79e00a9398..1449a356782 100644 --- a/dev-db/redis/redis-4.0.2.ebuild +++ b/dev-db/redis/redis-4.0.2.ebuild @@ -14,8 +14,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86 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:* ) + !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) tcmalloc? ( dev-util/google-perftools ) jemalloc? ( >=dev-libs/jemalloc-3.2 )" DEPEND="virtual/pkgconfig @@ -61,10 +64,15 @@ src_prepare() { done # autodetection of compiler and settings; generates the modified Makefiles cp "${FILESDIR}"/configure.ac-3.2 configure.ac + + # Use the correct pkgconfig name for Lua + has_version 'dev-lang/lua:5.1' \ + && LUAPKGCONFIG=lua5.1 \ + || LUAPKGCONFIG=lua 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,lua,g" \ + -e "/PKG_CHECK_MODULES.*\/s,lua5.1,${LUAPKGCONFIG},g" \ configure.ac || die "Sed failed for configure.ac" eautoreconf }