Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libdivsufsort/
Date: Fri, 07 Dec 2018 16:27:03
Message-Id: 1544200015.911129d310c65d47b4a562a3c8bd719580244346.mgorny@gentoo
1 commit: 911129d310c65d47b4a562a3c8bd719580244346
2 Author: François-Xavier Carton <fx.carton91 <AT> gmail <DOT> com>
3 AuthorDate: Wed Dec 5 19:32:38 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 7 16:26:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=911129d3
7
8 dev-libs/libdivsufsort: add openmp support
9
10 Package-Manager: Portage-2.3.51, Repoman-2.3.11
11 Signed-off-by: François-Xavier Carton <fx.carton91 <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/10559
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild | 14 +++++++++++---
16 dev-libs/libdivsufsort/libdivsufsort-9999.ebuild | 14 +++++++++++---
17 2 files changed, 22 insertions(+), 6 deletions(-)
18
19 diff --git a/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
20 index 3d6d79ec991..644a49823e3 100644
21 --- a/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
22 +++ b/dev-libs/libdivsufsort/libdivsufsort-2.0.1-r1.ebuild
23 @@ -2,7 +2,7 @@
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 -inherit cmake-utils multilib
28 +inherit cmake-utils multilib toolchain-funcs
29
30 DESCRIPTION="Suffix-sorting library (for BWT)"
31 HOMEPAGE="https://github.com/y-256/libdivsufsort"
32 @@ -11,7 +11,15 @@ SRC_URI="https://github.com/y-256/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
33 LICENSE="MIT"
34 SLOT="0"
35 KEYWORDS="~amd64 ~x86"
36 -IUSE=""
37 +IUSE="openmp"
38 +
39 +pkg_pretend() {
40 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
41 +}
42 +
43 +pkg_setup() {
44 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
45 +}
46
47 src_prepare() {
48 cmake-utils_src_prepare
49 @@ -22,6 +30,6 @@ src_prepare() {
50 }
51
52 src_configure() {
53 - local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON")
54 + local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)")
55 cmake-utils_src_configure
56 }
57
58 diff --git a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
59 index 65e76c91651..d6c33d70a4c 100644
60 --- a/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
61 +++ b/dev-libs/libdivsufsort/libdivsufsort-9999.ebuild
62 @@ -3,7 +3,7 @@
63
64 EAPI=6
65 EGIT_REPO_URI="https://github.com/y-256/${PN}"
66 -inherit cmake-utils multilib git-r3
67 +inherit cmake-utils multilib toolchain-funcs git-r3
68
69 DESCRIPTION="Suffix-sorting library (for BWT)"
70 HOMEPAGE="https://github.com/y-256/libdivsufsort"
71 @@ -12,7 +12,15 @@ SRC_URI=""
72 LICENSE="MIT"
73 SLOT="0"
74 KEYWORDS=""
75 -IUSE=""
76 +IUSE="openmp"
77 +
78 +pkg_pretend() {
79 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
80 +}
81 +
82 +pkg_setup() {
83 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
84 +}
85
86 src_prepare() {
87 cmake-utils_src_prepare
88 @@ -23,6 +31,6 @@ src_prepare() {
89 }
90
91 src_configure() {
92 - local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON")
93 + local mycmakeargs=("-DBUILD_DIVSUFSORT64=ON" "-DUSE_OPENMP=$(usex openmp)")
94 cmake-utils_src_configure
95 }