1 |
commit: cc7d0d075fe7fc9e3228eb7c108c122b855fd8b8 |
2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jun 24 15:25:03 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 28 17:23:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7d0d07 |
7 |
|
8 |
meson.eclass: EAPI 8 support |
9 |
|
10 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
eclass/meson.eclass | 25 +++++++++---------------- |
14 |
1 file changed, 9 insertions(+), 16 deletions(-) |
15 |
|
16 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
17 |
index c9a5e0b5956..a0b3906078c 100644 |
18 |
--- a/eclass/meson.eclass |
19 |
+++ b/eclass/meson.eclass |
20 |
@@ -5,7 +5,7 @@ |
21 |
# @MAINTAINER: |
22 |
# William Hubbs <williamh@g.o> |
23 |
# Mike Gilbert <floppym@g.o> |
24 |
-# @SUPPORTED_EAPIS: 6 7 |
25 |
+# @SUPPORTED_EAPIS: 6 7 8 |
26 |
# @BLURB: common ebuild functions for meson-based packages |
27 |
# @DESCRIPTION: |
28 |
# This eclass contains the default phase functions for packages which |
29 |
@@ -15,7 +15,7 @@ |
30 |
# Typical ebuild using meson.eclass: |
31 |
# |
32 |
# @CODE |
33 |
-# EAPI=6 |
34 |
+# EAPI=8 |
35 |
# |
36 |
# inherit meson |
37 |
# |
38 |
@@ -23,7 +23,7 @@ |
39 |
# |
40 |
# src_configure() { |
41 |
# local emesonargs=( |
42 |
-# $(meson_use qt4) |
43 |
+# $(meson_use qt5) |
44 |
# $(meson_feature threads) |
45 |
# $(meson_use bindist official_branding) |
46 |
# ) |
47 |
@@ -34,32 +34,25 @@ |
48 |
# |
49 |
# @CODE |
50 |
|
51 |
-case ${EAPI:-0} in |
52 |
- 6|7) ;; |
53 |
- *) die "EAPI=${EAPI} is not supported" ;; |
54 |
+case ${EAPI} in |
55 |
+ 6|7|8) ;; |
56 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
57 |
esac |
58 |
|
59 |
if [[ -z ${_MESON_ECLASS} ]]; then |
60 |
+_MESON_ECLASS=1 |
61 |
|
62 |
+[[ ${EAPI} == 6 ]] && inherit eapi7-ver |
63 |
inherit multiprocessing ninja-utils python-utils-r1 toolchain-funcs |
64 |
|
65 |
-if [[ ${EAPI} == 6 ]]; then |
66 |
- inherit eapi7-ver |
67 |
-fi |
68 |
- |
69 |
-fi |
70 |
- |
71 |
EXPORT_FUNCTIONS src_configure src_compile src_test src_install |
72 |
|
73 |
-if [[ -z ${_MESON_ECLASS} ]]; then |
74 |
-_MESON_ECLASS=1 |
75 |
- |
76 |
MESON_DEPEND=">=dev-util/meson-0.56.0 |
77 |
>=dev-util/ninja-1.8.2 |
78 |
dev-util/meson-format-array |
79 |
" |
80 |
|
81 |
-if [[ ${EAPI:-0} == [6] ]]; then |
82 |
+if [[ ${EAPI} == 6 ]]; then |
83 |
DEPEND=${MESON_DEPEND} |
84 |
else |
85 |
BDEPEND=${MESON_DEPEND} |