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/hypre/
Date: Sat, 14 May 2022 21:30:45
Message-Id: 1652563823.a8ff4bb9491b47186c73c7c20c4d5d7be761ee8a.soap@gentoo
1 commit: a8ff4bb9491b47186c73c7c20c4d5d7be761ee8a
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 14 21:30:23 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat May 14 21:30:23 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8ff4bb9
7
8 sci-libs/hypre: [QA] tc-has-openmp → tc-check-openmp
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sci-libs/hypre/hypre-2.20.0.ebuild | 17 +++++++----------
13 sci-libs/hypre/hypre-2.21.0.ebuild | 17 +++++++----------
14 2 files changed, 14 insertions(+), 20 deletions(-)
15
16 diff --git a/sci-libs/hypre/hypre-2.20.0.ebuild b/sci-libs/hypre/hypre-2.20.0.ebuild
17 index c7a163995f57..f1b93093da7b 100644
18 --- a/sci-libs/hypre/hypre-2.20.0.ebuild
19 +++ b/sci-libs/hypre/hypre-2.20.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 @@ -27,16 +27,12 @@ DEPEND="${RDEPEND}"
27 DOCS=( CHANGELOG COPYRIGHT README )
28
29 pkg_pretend() {
30 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
31 - tc-check-openmp
32 - fi
33 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
34 }
35
36 pkg_setup() {
37 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
38 - ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
39 - die "Need an OpenMP capable compiler"
40 - fi
41 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
42 + use fortran && fortran-2_pkg_setup
43 }
44
45 src_prepare() {
46 @@ -60,8 +56,9 @@ src_configure() {
47 tc-export CC CXX
48 append-flags -Dhypre_dgesvd=dgesvd_
49
50 - if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
51 - append-flags -fopenmp && append-ldflags -fopenmp
52 + if use openmp ; then
53 + append-flags -fopenmp
54 + append-ldflags -fopenmp
55 fi
56
57 if use mpi ; then
58
59 diff --git a/sci-libs/hypre/hypre-2.21.0.ebuild b/sci-libs/hypre/hypre-2.21.0.ebuild
60 index dea4da0e5cd7..8c9d5ab220f1 100644
61 --- a/sci-libs/hypre/hypre-2.21.0.ebuild
62 +++ b/sci-libs/hypre/hypre-2.21.0.ebuild
63 @@ -1,4 +1,4 @@
64 -# Copyright 1999-2021 Gentoo Authors
65 +# Copyright 1999-2022 Gentoo Authors
66 # Distributed under the terms of the GNU General Public License v2
67
68 EAPI=7
69 @@ -28,16 +28,12 @@ DEPEND="${RDEPEND}"
70 DOCS=( CHANGELOG COPYRIGHT README )
71
72 pkg_pretend() {
73 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
74 - tc-check-openmp
75 - fi
76 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
77 }
78
79 pkg_setup() {
80 - if [[ ${MERGE_TYPE} != binary ]] && use openmp && [[ $(tc-getCC) == *gcc* ]] && ! tc-has-openmp ; then
81 - ewarn "You are using a non capable gcc compiler ( < 4.2 ? )"
82 - die "Need an OpenMP capable compiler"
83 - fi
84 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
85 + use fortran && fortran-2_pkg_setup
86 }
87
88 src_prepare() {
89 @@ -61,8 +57,9 @@ src_configure() {
90 tc-export CC CXX
91 append-flags -Dhypre_dgesvd=dgesvd_
92
93 - if use openmp && [[ $(tc-getCC) == *gcc* ]] ; then
94 - append-flags -fopenmp && append-ldflags -fopenmp
95 + if use openmp ; then
96 + append-flags -fopenmp
97 + append-ldflags -fopenmp
98 fi
99
100 if use mpi ; then