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 67965138330 for ; Fri, 7 Oct 2016 08:41:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B01C221C054; Fri, 7 Oct 2016 08:41:35 +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 8303F21C054 for ; Fri, 7 Oct 2016 08:41:35 +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 EA26134139F for ; Fri, 7 Oct 2016 08:41:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B228248A for ; Fri, 7 Oct 2016 08:41:31 +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: <1475829681.5d5f3ac1f6d24c6893be04c9f1637a408b62c713.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: 5d5f3ac1f6d24c6893be04c9f1637a408b62c713 X-VCS-Branch: master Date: Fri, 7 Oct 2016 08:41:31 +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: 8f21d09f-fe42-4f63-b1d0-9b43170c8a44 X-Archives-Hash: 8aea0bd96e8bc0726035e5c8143f4963 commit: 5d5f3ac1f6d24c6893be04c9f1637a408b62c713 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 6 15:19:42 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 7 08:41:21 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d5f3ac1 sys-libs/libcxx: Fix ldscripts to include gcc EH lib for USE=-unwind sys-libs/libcxx/libcxx-3.9.0.ebuild | 7 ++----- sys-libs/libcxx/libcxx-9999.ebuild | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/sys-libs/libcxx/libcxx-3.9.0.ebuild b/sys-libs/libcxx/libcxx-3.9.0.ebuild index 656a979..a92f0f8 100644 --- a/sys-libs/libcxx/libcxx-3.9.0.ebuild +++ b/sys-libs/libcxx/libcxx-3.9.0.ebuild @@ -161,12 +161,10 @@ gen_static_ldscript() { mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die # Generate libc++.a ldscript for inclusion of its dependencies so that # clang++ -stdlib=libc++ -static works out of the box. - local deps="libc++_static.a ${cxxabi_lib}" + local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" # On Linux/glibc it does not link without libpthread or libdl. It is # fine on FreeBSD. use elibc_glibc && deps+=" libpthread.a libdl.a" - # unlike libgcc_s, libunwind is not implicitly linked - use libunwind && deps+=" libunwind.a" gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die } @@ -177,8 +175,7 @@ gen_shared_ldscript() { local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")") mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die - local deps="libc++_shared.so ${cxxabi_lib}" - use libunwind && deps+=" libunwind.so" + local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die } diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild index a5e7c7f..bbc218b 100644 --- a/sys-libs/libcxx/libcxx-9999.ebuild +++ b/sys-libs/libcxx/libcxx-9999.ebuild @@ -158,12 +158,10 @@ gen_static_ldscript() { mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die # Generate libc++.a ldscript for inclusion of its dependencies so that # clang++ -stdlib=libc++ -static works out of the box. - local deps="libc++_static.a ${cxxabi_lib}" + local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" # On Linux/glibc it does not link without libpthread or libdl. It is # fine on FreeBSD. use elibc_glibc && deps+=" libpthread.a libdl.a" - # unlike libgcc_s, libunwind is not implicitly linked - use libunwind && deps+=" libunwind.a" gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die } @@ -174,8 +172,7 @@ gen_shared_ldscript() { local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")") mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die - local deps="libc++_shared.so ${cxxabi_lib}" - use libunwind && deps+=" libunwind.so" + local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die }