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 642AA1382C5 for ; Fri, 16 Mar 2018 09:32:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4995EE087D; Fri, 16 Mar 2018 09:32:57 +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 0F3E2E087D for ; Fri, 16 Mar 2018 09:32:57 +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 9B85C335C81 for ; Fri, 16 Mar 2018 09:32:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45DAE1F1 for ; Fri, 16 Mar 2018 09:32:53 +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: <1521192755.367e23c07ea0a6102eb674f02b649885275dd8e8.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.0.ebuild 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: 367e23c07ea0a6102eb674f02b649885275dd8e8 X-VCS-Branch: master Date: Fri, 16 Mar 2018 09:32:53 +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: 9a129172-ac3c-4899-be64-acc52dfddc66 X-Archives-Hash: 9c17033a18ef372f0da20357e98523db commit: 367e23c07ea0a6102eb674f02b649885275dd8e8 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 16 09:08:44 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 16 09:32:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367e23c0 sys-libs/llvm-libunwind: Fix running multilib tests Fix tests to use multilib-wrapped compiler. Otherwise, the tests were actually done using native ABI library which missed the point. Also, add missing MULTILIB_USEDEP. sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild | 9 +++++++-- sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild | 9 +++++++-- sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild | 9 +++++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild index fcc113a63c9..fe3c0e9d642 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.0.ebuild @@ -29,9 +29,9 @@ RDEPEND="!sys-libs/libunwind" # (but libcxx does not need to be built against it) DEPEND=" >=sys-devel/llvm-6 - test? ( + test? ( >=sys-devel/clang-3.9.0 sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}] - sys-libs/libcxxabi + sys-libs/libcxxabi[${MULTILIB_USEDEP}] $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" S=${WORKDIR}/${MY_P} @@ -84,6 +84,11 @@ multilib_src_configure() { } multilib_src_test() { + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die + cmake-utils_src_make check-unwind } 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 6eb95d733fc..83db4453f60 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-6.0.9999.ebuild @@ -28,9 +28,9 @@ RDEPEND="!sys-libs/libunwind" # (but libcxx does not need to be built against it) DEPEND=" >=sys-devel/llvm-6 - test? ( + test? ( >=sys-devel/clang-3.9.0 sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}] - sys-libs/libcxxabi + sys-libs/libcxxabi[${MULTILIB_USEDEP}] $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" # least intrusive of all @@ -84,6 +84,11 @@ multilib_src_configure() { } multilib_src_test() { + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die + cmake-utils_src_make check-unwind } diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild index 387b8c31086..238afe790e6 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild @@ -27,9 +27,9 @@ RDEPEND="!sys-libs/libunwind" # (but libcxx does not need to be built against it) DEPEND=" >=sys-devel/llvm-6 - test? ( + test? ( >=sys-devel/clang-3.9.0 sys-libs/libcxx[libunwind,${MULTILIB_USEDEP}] - sys-libs/libcxxabi + sys-libs/libcxxabi[${MULTILIB_USEDEP}] $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" # least intrusive of all @@ -83,6 +83,11 @@ multilib_src_configure() { } multilib_src_test() { + local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) + + [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" + sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die + cmake-utils_src_make check-unwind }