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 CA8141382C5 for ; Sat, 20 Jan 2018 08:54:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF3E6E0935; Sat, 20 Jan 2018 08:54:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B10FFE0935 for ; Sat, 20 Jan 2018 08:54:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 83410335C39 for ; Sat, 20 Jan 2018 08:54:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF0D1186 for ; Sat, 20 Jan 2018 08:54:52 +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: <1516438478.ee6810253547c6ec221b37ff8ffde0b8a0c27d2b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/llvm-libunwind/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild X-VCS-Directories: sys-libs/llvm-libunwind/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ee6810253547c6ec221b37ff8ffde0b8a0c27d2b X-VCS-Branch: master Date: Sat, 20 Jan 2018 08:54:52 +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-Archives-Salt: 17f064db-563c-4b2e-9c5c-ef9de4b3d419 X-Archives-Hash: 04caf8381293257a8c446f01a5b687dc commit: ee6810253547c6ec221b37ff8ffde0b8a0c27d2b Author: Michał Górny gentoo org> AuthorDate: Fri Jan 19 20:26:59 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jan 20 08:54:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee681025 sys-libs/llvm-libunwind: Enable testing Closes: https://bugs.gentoo.org/645044 .../llvm-libunwind/llvm-libunwind-6.0.9999.ebuild | 42 +++++++++++++++++++-- sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild | 44 ++++++++++++++++++++-- 2 files changed, 79 insertions(+), 7 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild index 6c50f73f19b..e972befc517 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild @@ -6,7 +6,8 @@ EAPI=6 : ${CMAKE_MAKEFILE_GENERATOR:=ninja} # (needed due to CMAKE_BUILD_TYPE != Gentoo) CMAKE_MIN_VERSION=3.7.0-r1 -inherit cmake-multilib git-r3 llvm +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +inherit cmake-multilib git-r3 llvm python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" @@ -18,15 +19,38 @@ EGIT_BRANCH="release_60" LICENSE="|| ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="debug +static-libs" +IUSE="debug +static-libs test" +RESTRICT="!test? ( test )" RDEPEND="!sys-libs/libunwind" # LLVM 4 required for llvm-config --cmakedir -DEPEND=">=sys-devel/llvm-4" +DEPEND=">=sys-devel/llvm-4 + test? ( + sys-libs/libcxx[${MULTILIB_USEDEP}] + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_unpack() { + # we need headers & test utilities + git-r3_fetch "https://git.llvm.org/git/libcxx.git + https://github.com/llvm-mirror/libcxx.git" + git-r3_fetch + + git-r3_checkout https://llvm.org/git/libcxx.git \ + "${WORKDIR}"/libcxx '' include utils/libcxx + git-r3_checkout +} + multilib_src_configure() { local libdir=$(get_libdir) @@ -34,11 +58,23 @@ multilib_src_configure() { -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) + -DLLVM_INCLUDE_TESTS=$(usex test) ) + if use test; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="-vv" + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx + ) + fi cmake-utils_src_configure } +multilib_src_test() { + cmake-utils_src_make check-unwind +} + multilib_src_install() { cmake-utils_src_install diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild index 88f7a92b6c9..5ed8fd671d3 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,8 @@ EAPI=6 : ${CMAKE_MAKEFILE_GENERATOR:=ninja} # (needed due to CMAKE_BUILD_TYPE != Gentoo) CMAKE_MIN_VERSION=3.7.0-r1 -inherit cmake-multilib git-r3 llvm +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +inherit cmake-multilib git-r3 llvm python-any-r1 DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://github.com/llvm-mirror/libunwind" @@ -17,15 +18,38 @@ EGIT_REPO_URI="https://git.llvm.org/git/libunwind.git LICENSE="|| ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="debug +static-libs" +IUSE="debug +static-libs test" +RESTRICT="!test? ( test )" RDEPEND="!sys-libs/libunwind" # LLVM 4 required for llvm-config --cmakedir -DEPEND=">=sys-devel/llvm-4" +DEPEND=">=sys-devel/llvm-4 + test? ( + sys-libs/libcxx[${MULTILIB_USEDEP}] + $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo +python_check_deps() { + has_version "dev-python/lit[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_unpack() { + # we need headers & test utilities + git-r3_fetch "https://git.llvm.org/git/libcxx.git + https://github.com/llvm-mirror/libcxx.git" + git-r3_fetch + + git-r3_checkout https://llvm.org/git/libcxx.git \ + "${WORKDIR}"/libcxx '' include utils/libcxx + git-r3_checkout +} + multilib_src_configure() { local libdir=$(get_libdir) @@ -33,11 +57,23 @@ multilib_src_configure() { -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) + -DLLVM_INCLUDE_TESTS=$(usex test) ) + if use test; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + -DLLVM_LIT_ARGS="-vv" + -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}"/libcxx + ) + fi cmake-utils_src_configure } +multilib_src_test() { + cmake-utils_src_make check-unwind +} + multilib_src_install() { cmake-utils_src_install