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/sundials/
Date: Sat, 14 May 2022 21:30:48
Message-Id: 1652563827.18aa29a9cc9ee5434c0d9664ba526c74444912d5.soap@gentoo
1 commit: 18aa29a9cc9ee5434c0d9664ba526c74444912d5
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:27 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18aa29a9
7
8 sci-libs/sundials: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sci-libs/sundials/sundials-5.2.0.ebuild | 12 +++++++-----
13 sci-libs/sundials/sundials-5.8.0.ebuild | 12 +++++++-----
14 2 files changed, 14 insertions(+), 10 deletions(-)
15
16 diff --git a/sci-libs/sundials/sundials-5.2.0.ebuild b/sci-libs/sundials/sundials-5.2.0.ebuild
17 index c99c2b643966..5af24cd4ed75 100644
18 --- a/sci-libs/sundials/sundials-5.2.0.ebuild
19 +++ b/sci-libs/sundials/sundials-5.2.0.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -31,11 +31,13 @@ DEPEND="${RDEPEND}"
27
28 PATCHES=( "${FILESDIR}"/${P}-fix-license-install-path.patch )
29
30 +pkg_pretend() {
31 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
32 +}
33 +
34 pkg_setup() {
35 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
36 - ewarn "OpenMP is not available in your current selected gcc"
37 - die "need openmp capable gcc"
38 - fi
39 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
40 + use fortran && fortran-2_pkg_setup
41 }
42
43 src_prepare() {
44
45 diff --git a/sci-libs/sundials/sundials-5.8.0.ebuild b/sci-libs/sundials/sundials-5.8.0.ebuild
46 index 623a8cee16ed..517e32342ded 100644
47 --- a/sci-libs/sundials/sundials-5.8.0.ebuild
48 +++ b/sci-libs/sundials/sundials-5.8.0.ebuild
49 @@ -1,4 +1,4 @@
50 -# Copyright 1999-2021 Gentoo Authors
51 +# Copyright 1999-2022 Gentoo Authors
52 # Distributed under the terms of the GNU General Public License v2
53
54 EAPI=8
55 @@ -39,11 +39,13 @@ PATCHES=(
56 "${FILESDIR}"/${P}-fix-license-install-path.patch
57 )
58
59 +pkg_pretend() {
60 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
61 +}
62 +
63 pkg_setup() {
64 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
65 - ewarn "OpenMP is not available in your current selected gcc"
66 - die "need openmp capable gcc"
67 - fi
68 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
69 + use fortran && fortran-2_pkg_setup
70 }
71
72 src_prepare() {