Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/
Date: Mon, 02 Oct 2017 07:00:47
Message-Id: 1506927601.35b7efda149b4239447eda88f778c0c6a39b12a1.grobian@gentoo
1 commit: 35b7efda149b4239447eda88f778c0c6a39b12a1
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 2 07:00:01 2017 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 2 07:00:01 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b7efda
7
8 media-libs/fontconfig: add back gperf workaround for bug #631980
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.1
11
12 media-libs/fontconfig/fontconfig-2.12.6.ebuild | 8 +-------
13 1 file changed, 1 insertion(+), 7 deletions(-)
14
15 diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
16 index e1a756f344f..7da223b1f2c 100644
17 --- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild
18 +++ b/media-libs/fontconfig/fontconfig-2.12.6.ebuild
19 @@ -42,14 +42,8 @@ pkg_setup() {
20
21 src_prepare() {
22 default
23 + export GPERF=$(type -P true) # avoid dependency on gperf, #631980
24 eautoreconf
25 -
26 - # this should be ok for everyone, but for safety I only apply it to
27 - # the platform I need this for sure
28 - if [[ ${CHOST} == *-darwin* ]] ; then
29 - # https://bugs.freedesktop.org/show_bug.cgi?id=101280
30 - rm src/fcobjshash.h src/fcobjshash.gperf
31 - fi
32 }
33
34 multilib_src_configure() {