| 1 |
commit: e6a35d9aa49ae35d85b9f96ee121aff2b60aa76b |
| 2 |
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 4 23:41:32 2016 +0000 |
| 4 |
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 23:47:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a35d9a |
| 7 |
|
| 8 |
cmake-utils.eclass: Expand suggestion related to functions banned EAPI 6 |
| 9 |
|
| 10 |
This reverts commit 14994bc4884b1d1eefe58f1c41e48f24eadf2d2b. |
| 11 |
|
| 12 |
eclass/cmake-utils.eclass | 4 ++-- |
| 13 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 16 |
index 4bd404d..6363d31 100644 |
| 17 |
--- a/eclass/cmake-utils.eclass |
| 18 |
+++ b/eclass/cmake-utils.eclass |
| 19 |
@@ -161,7 +161,7 @@ _cmake_use_me_now() { |
| 20 |
local arg=$2 |
| 21 |
[[ ! -z $3 ]] && arg=$3 |
| 22 |
|
| 23 |
- [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later" |
| 24 |
+ [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead" |
| 25 |
|
| 26 |
local uper capitalised x |
| 27 |
[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]" |
| 28 |
@@ -184,7 +184,7 @@ _cmake_use_me_now_inverted() { |
| 29 |
[[ ! -z $3 ]] && arg=$3 |
| 30 |
|
| 31 |
if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then |
| 32 |
- die "${FUNCNAME[1]} is banned in EAPI 6 and later" |
| 33 |
+ die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead" |
| 34 |
fi |
| 35 |
|
| 36 |
local uper capitalised x |
Archives