diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-13 22:01:37 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-13 22:09:37 +0200 |
| commit | 16496a605e81e56500375918a02ca4b8f1c6fedf (patch) | |
| tree | 7f5d417d758208c07f180290be3d2134eb3c7cce /eclass | |
| parent | media-libs/libqaccessibilityclient: Set ECM_KDEINSTALLDIRS to false (diff) | |
| download | kde-16496a605e81e56500375918a02ca4b8f1c6fedf.tar.gz kde-16496a605e81e56500375918a02ca4b8f1c6fedf.tar.bz2 kde-16496a605e81e56500375918a02ca4b8f1c6fedf.zip | |
kde5.eclass: Fix KDE_INSTALL_LIBEXECDIR for EAPI-7 ebuilds
Reported-by: GinoM <onigino@protonmail.com>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde5.eclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index bc2bba2173..a3c86fee22 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -51,7 +51,8 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_ # @DESCRIPTION: # If set to "false", do nothing. # For any other value, assume the package is using KDEInstallDirs macro and switch -# KDE_INSTALL_USE_QT_SYS_PATHS to ON. +# KDE_INSTALL_USE_QT_SYS_PATHS to ON. For EAPI-7 and above, fix KDE_INSTALL_LIBEXECDIR +# to use the correct location. : ${ECM_KDEINSTALLDIRS:=true} # @ECLASS-VARIABLE: KDE_AUTODEPS @@ -647,6 +648,12 @@ kde5_src_configure() { # install mkspecs in the same directory as qt stuff -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ) + if [[ ${EAPI} != 6 ]] ; then + cmakeargs+=( + # install to correct libexec location + -DKDE_INSTALL_LIBEXECDIR=${EPREFIX}/usr/libexec + ) + fi fi # allow the ebuild to override what we set here |