Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/swig/
Date: Fri, 22 May 2020 00:02:55
Message-Id: 1590105676.15b5a88eb7fece8b5912b37d54dc0f3f6c4f6e0b.vapier@gentoo
1 commit: 15b5a88eb7fece8b5912b37d54dc0f3f6c4f6e0b
2 Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
3 AuthorDate: Thu May 21 23:47:04 2020 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Fri May 22 00:01:16 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b5a88e
7
8 dev-lang/swig: fix pkg-config handling
9
10 The build uses a non-standard envvar, but even with that it needs a
11 minor fix to avoid a hardcoded pkg-config invocation.
12
13 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
14
15 dev-lang/swig/swig-4.0.0.ebuild | 11 +++++++++++
16 1 file changed, 11 insertions(+)
17
18 diff --git a/dev-lang/swig/swig-4.0.0.ebuild b/dev-lang/swig/swig-4.0.0.ebuild
19 index bcce897c1e2..8d6bcfe6f47 100644
20 --- a/dev-lang/swig/swig-4.0.0.ebuild
21 +++ b/dev-lang/swig/swig-4.0.0.ebuild
22 @@ -3,6 +3,8 @@
23
24 EAPI=7
25
26 +inherit toolchain-funcs
27 +
28 DESCRIPTION="Simplified Wrapper and Interface Generator"
29 HOMEPAGE="http://www.swig.org/"
30 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
31 @@ -19,8 +21,17 @@ RDEPEND="${DEPEND}"
32
33 DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
34
35 +src_prepare() {
36 + default
37 + # https://github.com/swig/swig/pull/1796
38 + sed -i \
39 + -e '/if pkg-config javascriptcoregtk-1.0/s:pkg-config:$PKGCONFIG:' \
40 + configure || die
41 +}
42 +
43 src_configure() {
44 econf \
45 + PKGCONFIG="$(tc-getPKG_CONFIG)" \
46 $(use_enable ccache) \
47 $(use_with pcre)
48 }