| 1 |
commit: 22a7695920dd985cbb8bf2e429723804e3fdce73 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 22 20:05:56 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 22 20:11:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a76959 |
| 7 |
|
| 8 |
sys-devel/llvm: Update the patch and ebuild partially scan-* changes |
| 9 |
|
| 10 |
Upstream has added installation rules for scan-build and scan-view, |
| 11 |
and make them FHS-aware. This is mostly neat, except that scan-view |
| 12 |
expects Python modules in /usr/share. The patch and ebuild is partially |
| 13 |
updated to accomodate this. It will require at least cleaning up |
| 14 |
/usr/share still. |
| 15 |
|
| 16 |
.../llvm/files/clang-3.8-gentoo-install.patch | 14 ++++++++++++++ |
| 17 |
...g-runtime-into-usr-lib-without-suffix-3.8.patch | 4 +--- |
| 18 |
sys-devel/llvm/llvm-9999.ebuild | 22 ++++------------------ |
| 19 |
3 files changed, 19 insertions(+), 21 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-devel/llvm/files/clang-3.8-gentoo-install.patch b/sys-devel/llvm/files/clang-3.8-gentoo-install.patch |
| 22 |
new file mode 100644 |
| 23 |
index 0000000..25c4fca |
| 24 |
--- /dev/null |
| 25 |
+++ b/sys-devel/llvm/files/clang-3.8-gentoo-install.patch |
| 26 |
@@ -0,0 +1,14 @@ |
| 27 |
+--- |
| 28 |
+ tools/clang/tools/scan-view/scan-view | 2 +- |
| 29 |
+ |
| 30 |
+diff --git a/tools/clang/tools/scan-view/bin/scan-view b/tools/clang/tools/scan-view/bin/scan-view |
| 31 |
+index fb27da6..1f8ddb8 100755 |
| 32 |
+--- a/tools/clang/tools/scan-view/bin/scan-view |
| 33 |
++++ b/tools/clang/tools/scan-view/bin/scan-view |
| 34 |
+@@ -66,2 +66,2 @@ def start_browser(port, options): |
| 35 |
+- import ScanView |
| 36 |
++ from clang import ScanView |
| 37 |
+ try: |
| 38 |
+-- |
| 39 |
+1.8.4.4 |
| 40 |
+ |
| 41 |
|
| 42 |
diff --git a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 43 |
index cf2ca59..931eb56 100644 |
| 44 |
--- a/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 45 |
+++ b/sys-devel/llvm/files/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch |
| 46 |
@@ -29,9 +29,7 @@ diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt |
| 47 |
index 7de5fbe..49f439b 100644 |
| 48 |
--- a/tools/clang/lib/Headers/CMakeLists.txt |
| 49 |
+++ b/tools/clang/lib/Headers/CMakeLists.txt |
| 50 |
-@@ -98,4 +98,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") |
| 51 |
- install( |
| 52 |
- FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h |
| 53 |
+@@ -100,4 +100,4 @@ set_target_properties(clang-headers PROPERTIES FOLDER "Misc") |
| 54 |
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ |
| 55 |
- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) |
| 56 |
+ DESTINATION lib/clang/${CLANG_VERSION}/include) |
| 57 |
|
| 58 |
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild |
| 59 |
index 7150aa8..a413692 100644 |
| 60 |
--- a/sys-devel/llvm/llvm-9999.ebuild |
| 61 |
+++ b/sys-devel/llvm/llvm-9999.ebuild |
| 62 |
@@ -178,10 +178,7 @@ src_prepare() { |
| 63 |
# Automatically select active system GCC's libraries, bugs #406163 and #417913 |
| 64 |
epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch |
| 65 |
|
| 66 |
- epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch |
| 67 |
- |
| 68 |
- sed -i -e "s^@EPREFIX@^${EPREFIX}^" \ |
| 69 |
- tools/clang/tools/scan-build/scan-build || die |
| 70 |
+ epatch "${FILESDIR}"/clang-3.8-gentoo-install.patch |
| 71 |
|
| 72 |
# Install clang runtime into /usr/lib/clang |
| 73 |
# https://llvm.org/bugs/show_bug.cgi?id=23792 |
| 74 |
@@ -464,22 +461,9 @@ multilib_src_install_all() { |
| 75 |
if use clang; then |
| 76 |
pushd tools/clang >/dev/null || die |
| 77 |
|
| 78 |
- if use static-analyzer ; then |
| 79 |
- pushd tools/scan-build >/dev/null || die |
| 80 |
- |
| 81 |
- dobin ccc-analyzer scan-build |
| 82 |
- dosym ccc-analyzer /usr/bin/c++-analyzer |
| 83 |
- doman scan-build.1 |
| 84 |
- |
| 85 |
- insinto /usr/share/llvm |
| 86 |
- doins scanview.css sorttable.js |
| 87 |
- |
| 88 |
- popd >/dev/null || die |
| 89 |
- fi |
| 90 |
- |
| 91 |
python_inst() { |
| 92 |
if use static-analyzer ; then |
| 93 |
- pushd tools/scan-view >/dev/null || die |
| 94 |
+ pushd tools/scan-view/bin >/dev/null || die |
| 95 |
|
| 96 |
python_doscript scan-view |
| 97 |
|
| 98 |
@@ -488,6 +472,8 @@ multilib_src_install_all() { |
| 99 |
python_domodule *.py Resources |
| 100 |
|
| 101 |
popd >/dev/null || die |
| 102 |
+ |
| 103 |
+ # TODO: remove files installed in /usr/share |
| 104 |
fi |
| 105 |
|
| 106 |
if use python ; then |
Archives