Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/cudf/
Date: Mon, 11 Oct 2021 05:02:57
Message-Id: 1633928265.78fcfe98d7e96695c406b8481294b54039726842.sam@gentoo
1 commit: 78fcfe98d7e96695c406b8481294b54039726842
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 11 04:57:45 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 11 04:57:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fcfe98
7
8 dev-ml/cudf: allow llvm-libunwind
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-ml/cudf/{cudf-0.9-r1.ebuild => cudf-0.9-r2.ebuild} | 9 +++++----
13 1 file changed, 5 insertions(+), 4 deletions(-)
14
15 diff --git a/dev-ml/cudf/cudf-0.9-r1.ebuild b/dev-ml/cudf/cudf-0.9-r2.ebuild
16 similarity index 84%
17 rename from dev-ml/cudf/cudf-0.9-r1.ebuild
18 rename to dev-ml/cudf/cudf-0.9-r2.ebuild
19 index 769436a427c..dcde5334719 100644
20 --- a/dev-ml/cudf/cudf-0.9-r1.ebuild
21 +++ b/dev-ml/cudf/cudf-0.9-r2.ebuild
22 @@ -12,7 +12,7 @@ SRC_URI="https://gforge.inria.fr/frs/download.php/file/36602/${P}.tar.gz"
23 LICENSE="LGPL-3"
24 SLOT="0/${PV}"
25 KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
26 -IUSE="+ocamlopt test"
27 +IUSE="+ocamlopt llvm-libunwind test"
28 RESTRICT="!test? ( test )"
29
30 RDEPEND="
31 @@ -20,7 +20,8 @@ RDEPEND="
32 dev-ml/extlib:=
33 dev-ml/findlib:=
34 dev-libs/glib:2
35 - sys-libs/libunwind:=
36 + llvm-libunwind? ( sys-libs/llvm-libunwind:= )
37 + !llvm-libunwind? ( sys-libs/libunwind:= )
38 sys-libs/ncurses:=
39 "
40 DEPEND="${RDEPEND}
41 @@ -41,10 +42,10 @@ src_prepare() {
42 -e 's|make|$(MAKE)|g' \
43 Makefile || die
44 sed -i \
45 - -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
46 + -e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
47 c-lib/Makefile || die
48 sed -i \
49 - -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0 libunwind)|g' \
50 + -e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0) -lunwind|g' \
51 c-lib/Makefile.variants || die
52
53 tc-export CC PKG_CONFIG