| 1 |
commit: a7a2df0f47be3f3bf59d2839755914f962eb91bb |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 21:30:28 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 21:30:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a2df0f |
| 7 |
|
| 8 |
sci-mathematics/normaliz: [QA] tc-has-openmp → tc-check-openmp |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/25486 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild | 13 +++++++++---- |
| 14 |
sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild | 8 ++++++-- |
| 15 |
sci-mathematics/normaliz/normaliz-3.9.3.ebuild | 6 +++++- |
| 16 |
3 files changed, 20 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild |
| 19 |
index bc18fd6a3868..a2d3890c2854 100644 |
| 20 |
--- a/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild |
| 21 |
+++ b/sci-mathematics/normaliz/normaliz-3.1.3-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2021 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=6 |
| 28 |
@@ -26,15 +26,20 @@ DEPEND="${RDEPEND} |
| 29 |
|
| 30 |
S=${WORKDIR}/${MYP} |
| 31 |
|
| 32 |
+pkg_pretend() { |
| 33 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 34 |
+} |
| 35 |
+ |
| 36 |
+pkg_setup() { |
| 37 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 38 |
+} |
| 39 |
+ |
| 40 |
src_prepare() { |
| 41 |
./bootstrap.sh || die |
| 42 |
default |
| 43 |
} |
| 44 |
|
| 45 |
src_configure() { |
| 46 |
- if use openmp && ! tc-has-openmp ; then |
| 47 |
- die "You requested openmp, but your toolchain does not support it." |
| 48 |
- fi |
| 49 |
econf $(use_enable openmp) |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild |
| 54 |
index 74f541639c16..d696ca7b9817 100644 |
| 55 |
--- a/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild |
| 56 |
+++ b/sci-mathematics/normaliz/normaliz-3.8.10-r1.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2021 Gentoo Authors |
| 59 |
+# Copyright 1999-2022 Gentoo Authors |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=7 |
| 63 |
@@ -25,8 +25,12 @@ DEPEND=" |
| 64 |
" |
| 65 |
# Only a boost header is needed -> not RDEPEND |
| 66 |
|
| 67 |
+pkg_pretend() { |
| 68 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 69 |
+} |
| 70 |
+ |
| 71 |
pkg_setup() { |
| 72 |
- use openmp && tc-check-openmp |
| 73 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 74 |
} |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
|
| 78 |
diff --git a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild |
| 79 |
index 7b7436eeb4e9..9fa89e9d001b 100644 |
| 80 |
--- a/sci-mathematics/normaliz/normaliz-3.9.3.ebuild |
| 81 |
+++ b/sci-mathematics/normaliz/normaliz-3.9.3.ebuild |
| 82 |
@@ -24,8 +24,12 @@ DEPEND=" |
| 83 |
" |
| 84 |
# Only a boost header is needed -> not RDEPEND |
| 85 |
|
| 86 |
+pkg_pretend() { |
| 87 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 88 |
+} |
| 89 |
+ |
| 90 |
pkg_setup() { |
| 91 |
- use openmp && tc-check-openmp |
| 92 |
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 93 |
} |
| 94 |
|
| 95 |
src_configure() { |
Archives