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: sys-devel/clang/
Date: Tue, 01 Nov 2016 09:07:35
Message-Id: 1477991238.023069664f237e624cd5658c5364b1aab0d46cc7.mgorny@gentoo
1 commit: 023069664f237e624cd5658c5364b1aab0d46cc7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 1 09:02:11 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 1 09:07:18 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02306966
7
8 sys-devel/clang: Pass runtime headers through header check
9
10 sys-devel/clang/clang-9999.ebuild | 11 ++++++++---
11 1 file changed, 8 insertions(+), 3 deletions(-)
12
13 diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
14 index a962a81..a4c4aa4 100644
15 --- a/sys-devel/clang/clang-9999.ebuild
16 +++ b/sys-devel/clang/clang-9999.ebuild
17 @@ -207,6 +207,10 @@ src_install() {
18
19 multilib-minimal_src_install
20
21 + # Move runtime headers to /usr/lib/clang, where they belong
22 + dodir /usr/lib
23 + mv "${ED}usr/include/clangrt" "${ED}usr/lib/clang" || die
24 +
25 # Apply CHOST and version suffix to clang tools
26 local clang_version=4.0
27 local clang_tools=( clang clang++ clang-cl clang-cpp )
28 @@ -247,9 +251,10 @@ src_install() {
29 multilib_src_install() {
30 cmake-utils_src_install
31
32 - # move headers to the correct directory
33 - dodir /usr/lib/clang
34 - cp -pR "${ED}usr/$(get_libdir)/clang"/* "${ED}usr/lib/clang/" || die
35 + # move headers to include/ to get them checked for ABI mismatch
36 + # (then to the correct directory in src_install())
37 + insinto /usr/include/clangrt
38 + doins -r "${ED}usr/$(get_libdir)/clang"/.
39 rm -r "${ED}usr/$(get_libdir)/clang" || die
40 }