| 1 |
commit: a00eb48ca07ce05723121e5e24318367adc6704a |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jun 26 20:44:19 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 2 15:32:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00eb48c |
| 7 |
|
| 8 |
meson-multilib.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 |
Closes: https://github.com/gentoo/gentoo/pull/21440 |
| 13 |
|
| 14 |
eclass/meson-multilib.eclass | 12 ++++++------ |
| 15 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/meson-multilib.eclass b/eclass/meson-multilib.eclass |
| 18 |
index 01e14988463..fc1ef5802f9 100644 |
| 19 |
--- a/eclass/meson-multilib.eclass |
| 20 |
+++ b/eclass/meson-multilib.eclass |
| 21 |
@@ -7,7 +7,7 @@ |
| 22 |
# @AUTHOR: |
| 23 |
# Author: Michał Górny <mgorny@g.o> |
| 24 |
# Author: Matt Turner <mattst88@g.o> |
| 25 |
-# @SUPPORTED_EAPIS: 7 |
| 26 |
+# @SUPPORTED_EAPIS: 7 8 |
| 27 |
# @BLURB: meson wrapper for multilib builds |
| 28 |
# @DESCRIPTION: |
| 29 |
# The meson-multilib.eclass provides a glue between meson.eclass(5) |
| 30 |
@@ -20,14 +20,14 @@ |
| 31 |
# in multilib-minimal, yet they ought to call appropriate meson |
| 32 |
# phase rather than 'default'. |
| 33 |
|
| 34 |
+case ${EAPI} in |
| 35 |
+ 7|8) ;; |
| 36 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 37 |
+esac |
| 38 |
+ |
| 39 |
if [[ -z ${_MESON_MULTILIB_ECLASS} ]] ; then |
| 40 |
_MESON_MULTILIB_ECLASS=1 |
| 41 |
|
| 42 |
-case ${EAPI:-0} in |
| 43 |
- 7) ;; |
| 44 |
- *) die "EAPI=${EAPI} is not supported" ;; |
| 45 |
-esac |
| 46 |
- |
| 47 |
inherit meson multilib-minimal |
| 48 |
|
| 49 |
EXPORT_FUNCTIONS src_configure src_compile src_test src_install |
Archives