diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2019-07-22 12:21:49 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2019-07-22 12:42:15 +0200 |
| commit | 5f913fe23872ef1f05bf42e509e6b76880cade1d (patch) | |
| tree | 5decab4e525e2f43273520c9ef8a51335c68df31 /sys-devel/clang | |
| parent | sys-devel/llvm: 9.0.0+ introduce Z3 support (moved from clang) (diff) | |
| download | gentoo-5f913fe23872ef1f05bf42e509e6b76880cade1d.tar.gz gentoo-5f913fe23872ef1f05bf42e509e6b76880cade1d.tar.bz2 gentoo-5f913fe23872ef1f05bf42e509e6b76880cade1d.zip | |
sys-devel/clang: 9.0.0+ moved z3 support to LLVM
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-devel/clang')
| -rw-r--r-- | sys-devel/clang/clang-10.0.0.9999.ebuild | 12 | ||||
| -rw-r--r-- | sys-devel/clang/clang-9.0.0.9999.ebuild | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild index 68f98a07ff3d..78fe3665ce6d 100644 --- a/sys-devel/clang/clang-10.0.0.9999.ebuild +++ b/sys-devel/clang/clang-10.0.0.9999.ebuild @@ -29,15 +29,12 @@ LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer - test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" RESTRICT="!test? ( test )" RDEPEND=" ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] - static-analyzer? ( - dev-lang/perl:* - z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] ) - ) + static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) ${PYTHON_DEPS}" # configparser-3.2 breaks the build (3.3 or none at all are fine) @@ -135,8 +132,6 @@ multilib_src_configure() { -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - # z3 is not multilib-friendly - -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3) ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" @@ -157,9 +152,6 @@ multilib_src_configure() { -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" -DSPHINX_WARNINGS_AS_ERRORS=OFF ) - use z3 && mycmakeargs+=( - -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3" - ) else mycmakeargs+=( -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF diff --git a/sys-devel/clang/clang-9.0.0.9999.ebuild b/sys-devel/clang/clang-9.0.0.9999.ebuild index 82c8d492edf2..d10d959dff1d 100644 --- a/sys-devel/clang/clang-9.0.0.9999.ebuild +++ b/sys-devel/clang/clang-9.0.0.9999.ebuild @@ -28,15 +28,12 @@ LICENSE="UoI-NCSA" SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer - test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" + test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" RESTRICT="!test? ( test )" RDEPEND=" ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] - static-analyzer? ( - dev-lang/perl:* - z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] ) - ) + static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) ${PYTHON_DEPS}" # configparser-3.2 breaks the build (3.3 or none at all are fine) @@ -134,8 +131,6 @@ multilib_src_configure() { -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - # z3 is not multilib-friendly - -DCLANG_ANALYZER_ENABLE_Z3_SOLVER=$(usex z3) ) use test && mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" @@ -156,9 +151,6 @@ multilib_src_configure() { -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" -DSPHINX_WARNINGS_AS_ERRORS=OFF ) - use z3 && mycmakeargs+=( - -DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3" - ) else mycmakeargs+=( -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF |