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 63E50139085 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 BA68BE0C97; Sun, 15 Jan 2017 14:31:14 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97DABE0C97 for ; Sun, 15 Jan 2017 14:31:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DB79D341398 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 0607F2806 for ; Sun, 15 Jan 2017 14:31:06 +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: <1484490661.7384151ea7963b2314524e6f92a122fcf7bf27f4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libcxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libcxx/libcxx-9999.ebuild X-VCS-Directories: sys-libs/libcxx/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7384151ea7963b2314524e6f92a122fcf7bf27f4 X-VCS-Branch: master Date: Sun, 15 Jan 2017 14:31:06 +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: 2de84a7d-fd3c-402d-93ec-c3c7268c55dc X-Archives-Hash: d50cfdd286768214230cf83a01b6bf32 commit: 7384151ea7963b2314524e6f92a122fcf7bf27f4 Author: Michał Górny gentoo org> AuthorDate: Sun Jan 15 14:14:04 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jan 15 14:31:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7384151e sys-libs/libcxx: Remove unnecessary LLVM_LIBDIR_SUFFIX sys-libs/libcxx/libcxx-9999.ebuild | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index a5f89ac..c9030c1 100644 --- a/sys-libs/libcxx/libcxx-9999.ebuild +++ b/sys-libs/libcxx/libcxx-9999.ebuild @@ -41,15 +41,14 @@ RDEPEND=" libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] ) !libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )" -# llvm-3.9.0 needed because its cmake files installation path changed, which is -# needed by libcxx +# LLVM 4 required for llvm-config --cmakedir # clang-3.9.0 installs necessary target symlinks unconditionally # which removes the need for MULTILIB_USEDEP DEPEND="${RDEPEND} test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') ) app-arch/xz-utils - >=sys-devel/llvm-3.9.0" + >=sys-devel/llvm-4" DOCS=( CREDITS.TXT ) @@ -83,11 +82,6 @@ pkg_setup() { fi } -src_configure() { - NATIVE_LIBDIR=$(get_libdir) - cmake-multilib_src_configure -} - multilib_src_configure() { local cxxabi cxxabi_incs if use libcxxabi; then @@ -126,9 +120,6 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - # LLVM_LIBDIR_SUFFIX is used to find CMake files - # and we are happy to use the native set - -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib} -DLIBCXX_LIBDIR_SUFFIX=${libdir#lib} -DLIBCXX_ENABLE_SHARED=ON -DLIBCXX_ENABLE_STATIC=$(usex static-libs)