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 77207138330 for ; Mon, 3 Oct 2016 12:00:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 710E9E09FC; Mon, 3 Oct 2016 12:00:24 +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 54B99E09FC for ; Mon, 3 Oct 2016 12:00:24 +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 40224340E50 for ; Mon, 3 Oct 2016 12:00:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79165248E for ; Mon, 3 Oct 2016 12:00:21 +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: <1475495788.7e4620701ae0f56afb758bbe417e91e4d1b49e79.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-3.9.0.ebuild 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: 7e4620701ae0f56afb758bbe417e91e4d1b49e79 X-VCS-Branch: master Date: Mon, 3 Oct 2016 12:00:21 +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: 3035fffa-86de-4415-8a64-fbeeff983fcf X-Archives-Hash: 5102665306aef93daf30b70c3e42be52 commit: 7e4620701ae0f56afb758bbe417e91e4d1b49e79 Author: Michał Górny gentoo org> AuthorDate: Mon Oct 3 11:50:59 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Oct 3 11:56:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e462070 sys-libs/libcxx: Use CMake files from native LLVM build sys-libs/libcxx/libcxx-3.9.0.ebuild | 12 ++++++++++-- sys-libs/libcxx/libcxx-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/sys-libs/libcxx/libcxx-3.9.0.ebuild b/sys-libs/libcxx/libcxx-3.9.0.ebuild index 25e0b69..d466c0f 100644 --- a/sys-libs/libcxx/libcxx-3.9.0.ebuild +++ b/sys-libs/libcxx/libcxx-3.9.0.ebuild @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} test? ( sys-devel/clang[${MULTILIB_USEDEP}] ${PYTHON_DEPS} ) app-arch/xz-utils - >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]" + >=sys-devel/llvm-3.9.0" DOCS=( CREDITS.TXT ) @@ -94,6 +94,11 @@ src_unpack() { git-r3_checkout } +src_configure() { + NATIVE_LIBDIR=$(get_libdir) + cmake-multilib_src_configure +} + multilib_src_configure() { local cxxabi cxxabi_incs if use libcxxrt; then @@ -107,7 +112,10 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + # 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) -DLIBCXX_CXX_ABI=${cxxabi} diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index dc867aa..7f444c7 100644 --- a/sys-libs/libcxx/libcxx-9999.ebuild +++ b/sys-libs/libcxx/libcxx-9999.ebuild @@ -46,7 +46,7 @@ DEPEND="${RDEPEND} test? ( sys-devel/clang[${MULTILIB_USEDEP}] ${PYTHON_DEPS} ) app-arch/xz-utils - >=sys-devel/llvm-3.9.0[${MULTILIB_USEDEP}]" + >=sys-devel/llvm-3.9.0" DOCS=( CREDITS.TXT ) @@ -90,6 +90,11 @@ src_unpack() { git-r3_checkout } +src_configure() { + NATIVE_LIBDIR=$(get_libdir) + cmake-multilib_src_configure +} + multilib_src_configure() { local cxxabi cxxabi_incs if use libcxxrt; then @@ -103,7 +108,10 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + # 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) -DLIBCXX_CXX_ABI=${cxxabi}