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 D516B138330 for ; Thu, 6 Oct 2016 13:29:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7631FE0B62; Thu, 6 Oct 2016 13:29:12 +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 58380E0B62 for ; Thu, 6 Oct 2016 13:29:12 +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 C61A1341294 for ; Thu, 6 Oct 2016 13:29:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C32232490 for ; Thu, 6 Oct 2016 13:29:08 +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: <1475760537.1e7008e09bee9cbb9c4f99397210dc0b0cf0ce62.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-3.9.0.ebuild 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: 1e7008e09bee9cbb9c4f99397210dc0b0cf0ce62 X-VCS-Branch: master Date: Thu, 6 Oct 2016 13:29:08 +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: 754814d8-a18a-444b-9737-7fde5eb74a08 X-Archives-Hash: 62ef6b435f5b4b40ada7080f264b0ad1 commit: 1e7008e09bee9cbb9c4f99397210dc0b0cf0ce62 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 6 12:22:20 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 6 13:28:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7008e0 sys-libs/libcxxabi: Pass libunwind include & (fake) src path, #596340 sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild | 7 ++++++- sys-libs/libcxxabi/libcxxabi-9999.ebuild | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild index 4684548..a74a53d 100644 --- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild @@ -24,7 +24,7 @@ RDEPEND=" libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] - sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -66,6 +66,11 @@ multilib_src_configure() { -DLLVM_INCLUDE_TESTS=$(usex test) -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/include + # upstream is omitting standard search path for this + # probably because gcc & clang are bundling their own unwind.h + -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + # this only needs to exist, it does not have to make sense + -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" ) if use test; then mycmakeargs+=( diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild index 66de8aa..e84bfd7 100644 --- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild @@ -25,7 +25,7 @@ RDEPEND=" libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] - sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] + >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -69,6 +69,12 @@ multilib_src_configure() { -DLLVM_INCLUDE_TESTS=$(usex test) -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include + # upstream is omitting standard search path for this + # probably because gcc & clang are bundling their own unwind.h + -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include + # this only needs to exist, it does not have to make sense + # FIXME: remove this once https://reviews.llvm.org/D25314 is merged + -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" ) if use test; then mycmakeargs+=(