1 |
commit: 5d58c2ea1762e5c57d58265d4055378beaab54b6 |
2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jun 25 19:52:01 2021 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 9 01:41:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d58c2ea |
7 |
|
8 |
qmake-utils.eclass: EAPI 8 support |
9 |
|
10 |
https://github.com/gentoo/gentoo/pull/21539 |
11 |
|
12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
13 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
14 |
|
15 |
eclass/qmake-utils.eclass | 14 +++++++------- |
16 |
1 file changed, 7 insertions(+), 7 deletions(-) |
17 |
|
18 |
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass |
19 |
index 0d49eb94382..d726b362029 100644 |
20 |
--- a/eclass/qmake-utils.eclass |
21 |
+++ b/eclass/qmake-utils.eclass |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2020 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
# @ECLASS: qmake-utils.eclass |
28 |
@@ -6,7 +6,7 @@ |
29 |
# qt@g.o |
30 |
# @AUTHOR: |
31 |
# Davide Pesavento <pesa@g.o> |
32 |
-# @SUPPORTED_EAPIS: 7 |
33 |
+# @SUPPORTED_EAPIS: 7 8 |
34 |
# @BLURB: Common functions for qmake-based packages. |
35 |
# @DESCRIPTION: |
36 |
# Utility eclass providing wrapper functions for Qt5 qmake. |
37 |
@@ -14,14 +14,14 @@ |
38 |
# This eclass does not set any metadata variables nor export any phase |
39 |
# functions. It can be inherited safely. |
40 |
|
41 |
-if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then |
42 |
-_QMAKE_UTILS_ECLASS=1 |
43 |
- |
44 |
case ${EAPI} in |
45 |
- 7) ;; |
46 |
- *) die "EAPI=${EAPI:-0} is not supported" ;; |
47 |
+ 7|8) ;; |
48 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
49 |
esac |
50 |
|
51 |
+if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then |
52 |
+_QMAKE_UTILS_ECLASS=1 |
53 |
+ |
54 |
inherit toolchain-funcs |
55 |
|
56 |
# @FUNCTION: _qmake-utils_banned_func |