Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/
Date: Sat, 14 May 2022 21:30:46
Message-Id: 1652563821.db08774d96d5eb0b797cf0199625d7275587f428.soap@gentoo
1 commit: db08774d96d5eb0b797cf0199625d7275587f428
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:21 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db08774d
7
8 sci-libs/ceres-solver: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild | 10 +++-------
13 sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild | 10 +++-------
14 sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild | 8 ++------
15 3 files changed, 8 insertions(+), 20 deletions(-)
16
17 diff --git a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
18 index 4bd35e1b7fc8..67f410873961 100644
19 --- a/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
20 +++ b/sci-libs/ceres-solver/ceres-solver-1.14.0.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=7
27 @@ -48,15 +48,11 @@ DEPEND="${RDEPEND}"
28 DOCS=( README.md VERSION )
29
30 pkg_pretend() {
31 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
32 - if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
33 - ewarn "OpenMP is not available in your current selected gcc"
34 - die "need openmp capable gcc"
35 - fi
36 - fi
37 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
38 }
39
40 pkg_setup() {
41 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
42 use doc && python-any-r1_pkg_setup
43 }
44
45
46 diff --git a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
47 index 8ed07b8f792e..66ffb261da7c 100644
48 --- a/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
49 +++ b/sci-libs/ceres-solver/ceres-solver-2.0.0.ebuild
50 @@ -1,4 +1,4 @@
51 -# Copyright 1999-2021 Gentoo Authors
52 +# Copyright 1999-2022 Gentoo Authors
53 # Distributed under the terms of the GNU General Public License v2
54
55 EAPI=7
56 @@ -48,15 +48,11 @@ DOCS=( README.md VERSION )
57 PATCHES=( "${FILESDIR}/${P}-system-mathjax.patch" )
58
59 pkg_pretend() {
60 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
61 - if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
62 - ewarn "OpenMP is not available in your current selected gcc"
63 - die "need openmp capable gcc"
64 - fi
65 - fi
66 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
67 }
68
69 pkg_setup() {
70 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
71 use doc && python-any-r1_pkg_setup
72 }
73
74
75 diff --git a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
76 index 92fefb044a1a..fa2a76ca48ac 100644
77 --- a/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
78 +++ b/sci-libs/ceres-solver/ceres-solver-2.1.0.ebuild
79 @@ -48,15 +48,11 @@ PATCHES=(
80 )
81
82 pkg_pretend() {
83 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
84 - if [[ $(tc-getCXX) == *g++* ]] && ! tc-has-openmp; then
85 - ewarn "OpenMP is not available in your current selected gcc"
86 - die "need openmp capable gcc"
87 - fi
88 - fi
89 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
90 }
91
92 pkg_setup() {
93 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
94 use doc && python-any-r1_pkg_setup
95 }