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 552741382C5 for ; Fri, 25 Dec 2020 00:44:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B04CE0AD9; Fri, 25 Dec 2020 00:44:52 +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 61AF5E0AD9 for ; Fri, 25 Dec 2020 00:44:52 +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 17AA1341A7A for ; Fri, 25 Dec 2020 00:44:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85B3F2A9 for ; Fri, 25 Dec 2020 00:44:49 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1608857081.7fb18484cd11cdf968ea79ac82251afb8339d7e7.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/swift/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/swift/swift-4.0.2-r101.ebuild X-VCS-Directories: net-im/swift/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 7fb18484cd11cdf968ea79ac82251afb8339d7e7 X-VCS-Branch: master Date: Fri, 25 Dec 2020 00:44:49 +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: c69e475c-27b0-48bf-8d13-54bee008518b X-Archives-Hash: 35c7bd710092558cd22ccfa41762d448 commit: 7fb18484cd11cdf968ea79ac82251afb8339d7e7 Author: Conrad Kostecki gentoo org> AuthorDate: Fri Dec 25 00:40:43 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Dec 25 00:44:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb18484 net-im/swift: fix non lua compilation Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> net-im/swift/swift-4.0.2-r101.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net-im/swift/swift-4.0.2-r101.ebuild b/net-im/swift/swift-4.0.2-r101.ebuild index 3027230dbbf..449ae295a37 100644 --- a/net-im/swift/swift-4.0.2-r101.ebuild +++ b/net-im/swift/swift-4.0.2-r101.ebuild @@ -60,8 +60,8 @@ PATCHES=( ) pkg_setup() { + lua-single_pkg_setup python-any-r1_pkg_setup - use lua && lua-single_pkg_setup } src_prepare() { @@ -137,6 +137,9 @@ src_configure() { libnatpmp_force_bundled="false" link="$(tc-getCXX)" linkflags="${LDFLAGS}" + $(usex lua "lua_includedir=$(lua_get_include_dir)" '') + $(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '') + $(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '') lua_includedir="$(lua_get_include_dir)" lua_libdir="${EPREFIX}/usr/$(get_libdir)" lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"