From 0506d811d30e6cb1ca000e20d3026e6cf2cb5a73 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 26 Aug 2019 16:18:12 -0400 Subject: [PATCH] kodi-addon.eclass: EAPI=7 support, fix warning Fix CMAKE_INSTALL_LIBDIR warning, see: https://github.com/xbmc/xbmc/blob/18.3-Leia/cmake/scripts/common/AddonHelpers.cmake#L308 Signed-off-by: Craig Andrews --- eclass/kodi-addon.eclass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/kodi-addon.eclass b/eclass/kodi-addon.eclass index 8f34ccd92a56..e924dbdd6972 100644 --- a/eclass/kodi-addon.eclass +++ b/eclass/kodi-addon.eclass @@ -4,27 +4,31 @@ # @ECLASS: kodi-addon.eclass # @MAINTAINER: # candrews@gentoo.org -# @SUPPORTED_EAPIS: 4 5 6 +# @SUPPORTED_EAPIS: 4 5 6 7 # @BLURB: Helper for correct building and (importantly) installing Kodi addon packages. # @DESCRIPTION: # Provides a src_configure function for correct CMake configuration -inherit multilib cmake-utils +inherit cmake-utils case "${EAPI:-0}" in 4|5|6) - EXPORT_FUNCTIONS src_configure + inherit multilib + ;; + 7) ;; *) die "EAPI=${EAPI} is not supported" ;; esac +EXPORT_FUNCTIONS src_configure + # @FUNCTION: kodi-addon_src_configure # @DESCRIPTION: # Configure handling for Kodi addons kodi-addon_src_configure() { mycmakeargs+=( - -DCMAKE_INSTALL_LIBDIR=$(get_libdir)/kodi + -DCMAKE_INSTALL_LIBDIR=${EPREFIX%/}/usr/$(get_libdir)/kodi ) cmake-utils_src_configure -- 2.26.2