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: Wed, 30 Aug 2017 14:33:03
Message-Id: 1504103574.7bc712255bcf13450032db5f6ed644315c6dba28.mgorny@gentoo
1 commit: 7bc712255bcf13450032db5f6ed644315c6dba28
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 30 10:21:40 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 30 14:32:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc71225
7
8 sys-devel/clang: Fix unused Z3_INCLUDE_DIR warning
9
10 Declare Z3_INCLUDE_DIR only if [z3] is enabled, to avoid unused
11 variable warning from CMake.
12
13 sys-devel/clang/clang-5.0.9999.ebuild | 4 +++-
14 sys-devel/clang/clang-9999.ebuild | 4 +++-
15 2 files changed, 6 insertions(+), 2 deletions(-)
16
17 diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
18 index b619c8b888b..3b0cc5003f0 100644
19 --- a/sys-devel/clang/clang-5.0.9999.ebuild
20 +++ b/sys-devel/clang/clang-5.0.9999.ebuild
21 @@ -144,7 +144,6 @@ multilib_src_configure() {
22 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
23 # z3 is not multilib-friendly
24 -DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
25 - -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
26 )
27 use test && mycmakeargs+=(
28 -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
29 @@ -162,6 +161,9 @@ multilib_src_configure() {
30 -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
31 -DSPHINX_WARNINGS_AS_ERRORS=OFF
32 )
33 + use z3 && mycmakeargs+=(
34 + -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
35 + )
36 else
37 mycmakeargs+=(
38 -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
39
40 diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
41 index 7c3295cd8b5..730d965f126 100644
42 --- a/sys-devel/clang/clang-9999.ebuild
43 +++ b/sys-devel/clang/clang-9999.ebuild
44 @@ -145,7 +145,6 @@ multilib_src_configure() {
45 -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
46 # z3 is not multilib-friendly
47 -DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
48 - -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
49 )
50 use test && mycmakeargs+=(
51 -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
52 @@ -163,6 +162,9 @@ multilib_src_configure() {
53 -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
54 -DSPHINX_WARNINGS_AS_ERRORS=OFF
55 )
56 + use z3 && mycmakeargs+=(
57 + -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
58 + )
59 else
60 mycmakeargs+=(
61 -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF