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 B5D36139085 for ; Sun, 15 Jan 2017 14:31:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C486FE0C99; Sun, 15 Jan 2017 14:31:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9FC7DE0C98 for ; Sun, 15 Jan 2017 14:31:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFE973413AA for ; Sun, 15 Jan 2017 14:31:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E82242805 for ; Sun, 15 Jan 2017 14:31:05 +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: <1484490660.d6364296c2d36c0cbf9235a452c6968913a795e2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxxabi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxxabi/libcxxabi-9999.ebuild X-VCS-Directories: sys-libs/libcxxabi/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d6364296c2d36c0cbf9235a452c6968913a795e2 X-VCS-Branch: master Date: Sun, 15 Jan 2017 14:31:05 +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: 2d9d082e-73aa-4ddd-bbc5-caaa6796fa8b X-Archives-Hash: 9c677225f773012304f754ef0d9166d9 commit: d6364296c2d36c0cbf9235a452c6968913a795e2 Author: Michał Górny gentoo org> AuthorDate: Sun Jan 15 14:13:52 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jan 15 14:31:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6364296 sys-libs/libcxxabi: Remove unnecessary LLVM_LIBDIR_SUFFIX sys-libs/libcxxabi/libcxxabi-9999.ebuild | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild index 9a6cf0e..5840b01 100644 --- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild @@ -29,8 +29,9 @@ RDEPEND=" >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] ) )" +# LLVM 4 required for llvm-config --cmakedir DEPEND="${RDEPEND} - >=sys-devel/llvm-3.9.0 + >=sys-devel/llvm-4 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-${PV}[libcxxabi(-)] $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" @@ -57,15 +58,9 @@ src_unpack() { git-r3_checkout } -src_configure() { - NATIVE_LIBDIR=$(get_libdir) - cmake-multilib_src_configure -} - multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib} -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} -DLIBCXXABI_ENABLE_SHARED=ON -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)