Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/swift/
Date: Fri, 25 Dec 2020 00:44:53
Message-Id: 1608857081.7fb18484cd11cdf968ea79ac82251afb8339d7e7.conikost@gentoo
1 commit: 7fb18484cd11cdf968ea79ac82251afb8339d7e7
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 00:40:43 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 00:44:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb18484
7
8 net-im/swift: fix non lua compilation
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 net-im/swift/swift-4.0.2-r101.ebuild | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16 diff --git a/net-im/swift/swift-4.0.2-r101.ebuild b/net-im/swift/swift-4.0.2-r101.ebuild
17 index 3027230dbbf..449ae295a37 100644
18 --- a/net-im/swift/swift-4.0.2-r101.ebuild
19 +++ b/net-im/swift/swift-4.0.2-r101.ebuild
20 @@ -60,8 +60,8 @@ PATCHES=(
21 )
22
23 pkg_setup() {
24 + lua-single_pkg_setup
25 python-any-r1_pkg_setup
26 - use lua && lua-single_pkg_setup
27 }
28
29 src_prepare() {
30 @@ -137,6 +137,9 @@ src_configure() {
31 libnatpmp_force_bundled="false"
32 link="$(tc-getCXX)"
33 linkflags="${LDFLAGS}"
34 + $(usex lua "lua_includedir=$(lua_get_include_dir)" '')
35 + $(usex lua "lua_libdir=${EPREFIX}/usr/$(get_libdir)" '')
36 + $(usex lua "lua_libname=$(basename -s '.so' $(lua_get_shared_lib))" '')
37 lua_includedir="$(lua_get_include_dir)"
38 lua_libdir="${EPREFIX}/usr/$(get_libdir)"
39 lua_libname="$(basename -s '.so' $(lua_get_shared_lib))"