1 |
commit: 89f02e8736af383b076c9e57c1d8665da3580fff |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 14 20:44:50 2017 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 15 12:47:29 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f02e87 |
7 |
|
8 |
sys-devel/clang: Bump to 4.0.0.rc2 |
9 |
|
10 |
sys-devel/clang/Manifest | 6 +++--- |
11 |
.../{clang-4.0.0_rc1-r1.ebuild => clang-4.0.0_rc2.ebuild} | 11 +++++++++-- |
12 |
2 files changed, 12 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest |
15 |
index 09f1cad317..1f2b36a057 100644 |
16 |
--- a/sys-devel/clang/Manifest |
17 |
+++ b/sys-devel/clang/Manifest |
18 |
@@ -1,3 +1,3 @@ |
19 |
-DIST cfe-4.0.0rc1.src.tar.xz 10896792 SHA256 e1bf51a2df20b4b5eee59e443b4791c59fd1b60d637cd0706326edb25494c945 SHA512 51a4eae186c64fce71221d443364a1ecde3660d0ef8c5c066a154ac9fbe2de557a0b33c72d7eeefc2c992482ed8da823e66acc162e1961e96452c92638b4ede7 WHIRLPOOL 98dd37c07018d22c77bdfe2f4e521af5e46936731bce98575e28e402b8bdfae4e2af0c278e888d1a244c73bee9e0cfc00ec4d03bcc398354fbe7cd8722ecc717 |
20 |
-DIST clang-tools-extra-4.0.0rc1.src.tar.xz 583332 SHA256 bae008752067783fc5daba881490511ed0937c688cb6a320434b5b9efd78d12c SHA512 5b246eb2338733e0bf2695e6e4766dda6c280e983feeb3a321e71215abb3ba1a31c64df861ee8d1344e43e6c3c02823d99e0ec3fd17cb270b289d07d74a13620 WHIRLPOOL 92838bd8b7db646c4237d5f1d5768856813088b2d37b7756c53e1e91466fd78e345e1586e0dee61771d10ae43d12f864e48c93be761aae82e96d923e0d54ecad |
21 |
-DIST llvm-4.0.0rc1.src.tar.xz 20996760 SHA256 ccbff3a7af78efc12b5b7f749d184b4c8caf75621af4e05f640cbfa9f80f8604 SHA512 10b6fee561b9307490d5f20ce70b7e0099bd405e56c8330be9aa04673f39dbd712833e357a577a5106819336a1957dd73d288bbdd35286d56305d14d237dfd3d WHIRLPOOL 8559852df5d036a4d86a4555bcbeaab6bbb3b5e9cad9daa8c0f5e934e4fb7235bc05df55e09d38eb4d90832036d8b9f5b1ff8108e7d5ea01c86b00eecc0a3d13 |
22 |
+DIST cfe-4.0.0rc2.src.tar.xz 10898628 SHA256 76d6c9b7f388a93a0303dbbac0e42b183b242f822b65eb44064679e7c36aa5dc SHA512 d1015c636a77233bf8c7df28ad71c734cf4755ca5564d4de1fb2574ffb942dfb69e528316e94da54397383a9dca558b0474bd4c599086e8c63abd3de1ce2bb94 WHIRLPOOL 72e76dd862b209dcc18d232b2d723ea19c9aafd1c8ab2db5e23985aaabe382782d598ec6fd58f8209a6b579c35caa1050330474b112ecb32ac5d4eac53e3373d |
23 |
+DIST clang-tools-extra-4.0.0rc2.src.tar.xz 583208 SHA256 1f682bd28714cf95b3e5fa6e638276973442fed349acd8a38a08f15bca9efb7a SHA512 90b1d025c5aed9ebeb9d0c73e18f7734f151cd8637be5f9fd70a14953a73df134baa192ef76d049ac04b121cf2e32cecce311d145e275cd33fc1e7ebf999aad3 WHIRLPOOL 19cf25f96ddc486470cc5d85a28c8abae32ecc50e76e18c936aa2145922d3c075ffa0a105a02422cb59cb91aead5e8b962778b344de926b4089647e9c96544f5 |
24 |
+DIST llvm-4.0.0rc2.src.tar.xz 21005416 SHA256 2257faed3795fedfc509d6dd5905be158231c508c6fcaaa02e4a09c5e8dadbe1 SHA512 537356226123b8c9454ec3dfc3adbfb13cfa4bd35f530b85f2b3242391ea1fbd9abf65dfbb62db533e6eae4c9049bb260fb21dccfeb7e355306f4621d35474b7 WHIRLPOOL d79f343ca00c60dd49a3ada4808e779c45210ab03e365e614563b54879ac72b7e80b4022641db10ad2075a0d417ba7c182f9d3abf8c6b012622c0d1541a7dc69 |
25 |
|
26 |
diff --git a/sys-devel/clang/clang-4.0.0_rc1-r1.ebuild b/sys-devel/clang/clang-4.0.0_rc2.ebuild |
27 |
similarity index 96% |
28 |
rename from sys-devel/clang/clang-4.0.0_rc1-r1.ebuild |
29 |
rename to sys-devel/clang/clang-4.0.0_rc2.ebuild |
30 |
index 0c882c4d7c..bdb773fde7 100644 |
31 |
--- a/sys-devel/clang/clang-4.0.0_rc1-r1.ebuild |
32 |
+++ b/sys-devel/clang/clang-4.0.0_rc2.ebuild |
33 |
@@ -114,7 +114,7 @@ src_unpack() { |
34 |
|
35 |
default |
36 |
|
37 |
- mv clang-tools-extra-* "${S}"/tools/clang-tools-extra || die |
38 |
+ mv clang-tools-extra-* "${S}"/tools/extra || die |
39 |
if use test; then |
40 |
mv llvm-* "${WORKDIR}"/llvm || die |
41 |
fi |
42 |
@@ -127,6 +127,9 @@ src_prepare() { |
43 |
# fix stand-alone doc build |
44 |
eapply "${FILESDIR}"/9999/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch |
45 |
|
46 |
+ # kill extraneous deps |
47 |
+ sed -i -e '/FileCheck/d' tools/extra/test/CMakeLists.txt || die |
48 |
+ |
49 |
# User patches |
50 |
eapply_user |
51 |
} |
52 |
@@ -172,6 +175,9 @@ multilib_src_configure() { |
53 |
-DLLVM_BUILD_DOCS=$(usex doc) |
54 |
-DLLVM_ENABLE_SPHINX=$(usex doc) |
55 |
-DLLVM_ENABLE_DOXYGEN=OFF |
56 |
+ |
57 |
+ # workaround pthread |
58 |
+ -DPTHREAD_LIB=-pthread |
59 |
) |
60 |
use doc && mycmakeargs+=( |
61 |
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" |
62 |
@@ -179,7 +185,7 @@ multilib_src_configure() { |
63 |
) |
64 |
else |
65 |
mycmakeargs+=( |
66 |
- -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF |
67 |
+ -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF |
68 |
) |
69 |
fi |
70 |
|
71 |
@@ -209,6 +215,7 @@ multilib_src_test() { |
72 |
# respect TMPDIR! |
73 |
local -x LIT_PRESERVES_TMP=1 |
74 |
cmake-utils_src_make check-clang |
75 |
+ multilib_is_native_abi && cmake-utils_src_make check-clang-tools |
76 |
} |
77 |
|
78 |
src_install() { |