1 |
commit: 62beda086e835d7f6f2d0e2176cd0cedb2e72e94 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 28 07:50:20 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 28 16:30:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=62beda08 |
7 |
|
8 |
cmake-utils.eclass: Merge consecutive [[ ]] into single [[ ]] |
9 |
|
10 |
eclass/cmake-utils.eclass | 4 ++-- |
11 |
1 file changed, 2 insertions(+), 2 deletions(-) |
12 |
|
13 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
14 |
index 99c0f76..a5704c1 100644 |
15 |
--- a/eclass/cmake-utils.eclass |
16 |
+++ b/eclass/cmake-utils.eclass |
17 |
@@ -185,7 +185,7 @@ _cmake_use_me_now_inverted() { |
18 |
local arg=$2 |
19 |
[[ ! -z $3 ]] && arg=$3 |
20 |
|
21 |
- if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then |
22 |
+ if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then |
23 |
die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss" |
24 |
fi |
25 |
|
26 |
@@ -314,7 +314,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; } |
27 |
# if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled. |
28 |
# This can be used to make find_package optional. |
29 |
cmake-utils_use_find_package() { |
30 |
- if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then |
31 |
+ if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then |
32 |
die "Usage: cmake-utils_use_find_package <USE flag> <package name>" |
33 |
fi |