Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/colm/
Date: Wed, 14 Sep 2022 00:21:23
Message-Id: 1663114837.4ed80e7fbd76241d440fe0bcd84d8723f93b8d73.sam@gentoo
1 commit: 4ed80e7fbd76241d440fe0bcd84d8723f93b8d73
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 14 00:20:37 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 14 00:20:37 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed80e7f
7
8 dev-util/colm: respect CC
9
10 Fixes build on pure Clang systems.
11
12 There's a proper upstream fix [0] but it's too awkward
13 to backport with our other patches and there's been a lot of other
14 changes relating to our patches upstream anyway.
15
16 Have asked for a new release.
17
18 [0] https://github.com/adrian-thurston/colm/commit/bb487b1368b65a1f30fe3a59fd0c7d84bdcc483b.
19 Closes: https://bugs.gentoo.org/771849
20 Signed-off-by: Sam James <sam <AT> gentoo.org>
21
22 dev-util/colm/colm-0.14.7-r1.ebuild | 1 +
23 1 file changed, 1 insertion(+)
24
25 diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
26 index 59000e4847fa..147625389f13 100644
27 --- a/dev-util/colm/colm-0.14.7-r1.ebuild
28 +++ b/dev-util/colm/colm-0.14.7-r1.ebuild
29 @@ -36,6 +36,7 @@ src_prepare() {
30 sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
31
32 # bug #766069
33 + sed -i -e "s:gcc:$(tc-getCC) ${CFLAGS}:" src/main.cc || die
34 sed -i -e "s:gcc:$(tc-getCC):" test/colm.d/gentests.sh || die
35 sed -i -e "s:g++:$(tc-getCXX):" test/colm.d/gentests.sh || die