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 1A4DD158087 for ; Mon, 11 Oct 2021 05:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6631FE0636; Mon, 11 Oct 2021 05:02:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31F88E0636 for ; Mon, 11 Oct 2021 05:02:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F25043434AB for ; Mon, 11 Oct 2021 05:02:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21C9783 for ; Mon, 11 Oct 2021 05:02:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1633928265.78fcfe98d7e96695c406b8481294b54039726842.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/cudf/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ml/cudf/cudf-0.9-r1.ebuild dev-ml/cudf/cudf-0.9-r2.ebuild X-VCS-Directories: dev-ml/cudf/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 78fcfe98d7e96695c406b8481294b54039726842 X-VCS-Branch: master Date: Mon, 11 Oct 2021 05:02:53 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: deb73207-2502-4b2a-9b87-07f50baa516c X-Archives-Hash: b5b81f5be5f48bf7df39f344886bf1e0 commit: 78fcfe98d7e96695c406b8481294b54039726842 Author: Sam James gentoo org> AuthorDate: Mon Oct 11 04:57:45 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 11 04:57:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fcfe98 dev-ml/cudf: allow llvm-libunwind Signed-off-by: Sam James gentoo.org> dev-ml/cudf/{cudf-0.9-r1.ebuild => cudf-0.9-r2.ebuild} | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-ml/cudf/cudf-0.9-r1.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild similarity index 84% rename from dev-ml/cudf/cudf-0.9-r1.ebuild rename to dev-ml/cudf/cudf-0.9-r2.ebuild index 769436a427c..dcde5334719 100644 --- a/dev-ml/cudf/cudf-0.9-r1.ebuild +++ b/dev-ml/cudf/cudf-0.9-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0/${PV}" KEYWORDS="amd64 arm arm64 ppc ppc64 x86" -IUSE="+ocamlopt test" +IUSE="+ocamlopt llvm-libunwind test" RESTRICT="!test? ( test )" RDEPEND=" @@ -20,7 +20,8 @@ RDEPEND=" dev-ml/extlib:= dev-ml/findlib:= dev-libs/glib:2 - sys-libs/libunwind:= + llvm-libunwind? ( sys-libs/llvm-libunwind:= ) + !llvm-libunwind? ( sys-libs/libunwind:= ) sys-libs/ncurses:= " DEPEND="${RDEPEND} @@ -41,10 +42,10 @@ src_prepare() { -e 's|make|$(MAKE)|g' \ Makefile || die sed -i \ - -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \ + -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ c-lib/Makefile || die sed -i \ - -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \ + -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \ c-lib/Makefile.variants || die tc-export CC PKG_CONFIG