From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C2CD8138335 for ; Mon, 22 Jul 2019 10:42:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C510FE0825; Mon, 22 Jul 2019 10:42:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9729DE0825 for ; Mon, 22 Jul 2019 10:42:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D9AAA348708 for ; Mon, 22 Jul 2019 10:42:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5865572B for ; Mon, 22 Jul 2019 10:42:18 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1563792135.5f913fe23872ef1f05bf42e509e6b76880cade1d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-10.0.0.9999.ebuild sys-devel/clang/clang-9.0.0.9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 5f913fe23872ef1f05bf42e509e6b76880cade1d X-VCS-Branch: master Date: Mon, 22 Jul 2019 10:42:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e2a6c1a3-572c-4811-ba60-24516ca82e6b X-Archives-Hash: fbe55581959c7a56a5f629228aa7e069 commit: 5f913fe23872ef1f05bf42e509e6b76880cade1d Author: Michał Górny gentoo org> AuthorDate: Mon Jul 22 10:21:49 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Jul 22 10:42:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f913fe2 sys-devel/clang: 9.0.0+ moved z3 support to LLVM Signed-off-by: Michał Górny gentoo.org> sys-devel/clang/clang-10.0.0.9999.ebuild | 12 ++---------- 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 68f98a07ff3..78fe3665ce6 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 82c8d492edf..d10d959dff1 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