Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libclc/
Date: Sat, 12 Aug 2017 20:53:00
Message-Id: 1502571083.23c4307a73d0d7fa1d79c0a95125918cf8a38bc6.mgorny@gentoo
1 commit: 23c4307a73d0d7fa1d79c0a95125918cf8a38bc6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 12 20:51:23 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 12 20:51:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c4307a
7
8 dev-libs/libclc: Revert "fix llvm-config path."
9
10 Revert the non-maintainer commit that reintroduced the cross-slot clang
11 mismatch bug.
12
13 dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild | 6 +++++-
14 1 file changed, 5 insertions(+), 1 deletion(-)
15
16 diff --git a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild
17 index 003757a0998..c0ac06980cb 100644
18 --- a/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild
19 +++ b/dev-libs/libclc/libclc-0.2.0_pre20170118.ebuild
20 @@ -39,9 +39,13 @@ DEPEND="${RDEPEND}
21 ${PYTHON_DEPS}"
22
23 src_configure() {
24 + # we need to find llvm with matching clang version, so look for
25 + # clang first, and then use llvm-config from the same location
26 + local clang_path=$(type -P clang) || die
27 +
28 ./configure.py \
29 --with-cxx-compiler="$(tc-getCXX)" \
30 - --with-llvm-config="$(tc-getPROG LLVM_CONFIG llvm-config)" \
31 + --with-llvm-config="${clang_path%/*}/llvm-config" \
32 --prefix="${EPREFIX}/usr" || die
33 }