| 1 |
commit: 555121f6fd88b94cc3afacd27841d36f06a08cb6 |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Sat Jan 30 10:03:34 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Sat Jan 30 10:03:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=555121f6 |
| 7 |
|
| 8 |
eclass/numeric-int64-multibuild.eclass: use_if_iuse is deprecated |
| 9 |
|
| 10 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 11 |
|
| 12 |
eclass/numeric-int64-multibuild.eclass | 10 +++++----- |
| 13 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/numeric-int64-multibuild.eclass b/eclass/numeric-int64-multibuild.eclass |
| 16 |
index f720356a3..6ed9c1158 100644 |
| 17 |
--- a/eclass/numeric-int64-multibuild.eclass |
| 18 |
+++ b/eclass/numeric-int64-multibuild.eclass |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2017 Gentoo Foundation |
| 21 |
+# Copyright 1999-2021 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# @ECLASS: numeric-int64-multilib.eclass |
| 25 |
@@ -122,9 +122,9 @@ numeric-int64_get_module_name() { |
| 26 |
fi |
| 27 |
# choose posix threads over openmp when the two are set |
| 28 |
# yet to see the need of having the two profiles simultaneously |
| 29 |
- if use_if_iuse threads; then |
| 30 |
+ if in_iuse threads && use threads; then |
| 31 |
module_name+="-threads" |
| 32 |
- elif use_if_iuse openmp; then |
| 33 |
+ elif in_iuse openmp && use openmp; then |
| 34 |
module_name+="-openmp" |
| 35 |
fi |
| 36 |
echo "${module_name}" |
| 37 |
@@ -239,7 +239,7 @@ numeric-int64_get_multibuild_int_variants() { |
| 38 |
debug-print-function ${FUNCNAME} "${@}" |
| 39 |
local MULTIBUILD_VARIANTS=( int32 ) variant |
| 40 |
|
| 41 |
- use_if_iuse int64 && MULTIBUILD_VARIANTS+=( int64 ) |
| 42 |
+ in_iuse int64 && use int64 && MULTIBUILD_VARIANTS+=( int64 ) |
| 43 |
|
| 44 |
echo "${MULTIBUILD_VARIANTS[@]}" |
| 45 |
} |
| 46 |
@@ -251,7 +251,7 @@ numeric-int64_get_multibuild_int_variants() { |
| 47 |
numeric-int64_get_multibuild_variants() { |
| 48 |
debug-print-function ${FUNCNAME} "${@}" |
| 49 |
local MULTIBUILD_VARIANTS=$(numeric-int64_get_multibuild_int_variants) |
| 50 |
- if use_if_iuse static-libs; then |
| 51 |
+ if in_iuse static-libs && use static-libs; then |
| 52 |
for variant in ${MULTIBUILD_VARIANTS[@]}; do |
| 53 |
MULTIBUILD_VARIANTS+=( static_${variant} ) |
| 54 |
done |
Archives