| 1 |
commit: 958c50e9e40c11e3a56f520e3cf032b538906515 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 4 17:06:09 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 4 17:07:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958c50e9 |
| 7 |
|
| 8 |
kodi-addons.eclass: Switch EAPI-7 to cmake.eclass |
| 9 |
|
| 10 |
All EAPI-7 consumers in Gentoo ebuild repository have been ported. |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/kodi-addon.eclass | 10 ++++++---- |
| 15 |
1 file changed, 6 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass |
| 18 |
index e924dbdd697..914ee3e9f75 100644 |
| 19 |
--- a/eclass/kodi-addon.eclass |
| 20 |
+++ b/eclass/kodi-addon.eclass |
| 21 |
@@ -9,13 +9,12 @@ |
| 22 |
# @DESCRIPTION: |
| 23 |
# Provides a src_configure function for correct CMake configuration |
| 24 |
|
| 25 |
-inherit cmake-utils |
| 26 |
- |
| 27 |
case "${EAPI:-0}" in |
| 28 |
4|5|6) |
| 29 |
- inherit multilib |
| 30 |
+ inherit cmake-utils multilib |
| 31 |
;; |
| 32 |
7) |
| 33 |
+ inherit cmake |
| 34 |
;; |
| 35 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 36 |
esac |
| 37 |
@@ -31,5 +30,8 @@ kodi-addon_src_configure() { |
| 38 |
-DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi |
| 39 |
) |
| 40 |
|
| 41 |
- cmake-utils_src_configure |
| 42 |
+ case ${EAPI} in |
| 43 |
+ 4|5|6) cmake-utils_src_configure ;; |
| 44 |
+ 7) cmake_src_configure ;; |
| 45 |
+ esac |
| 46 |
} |
Archives