From 0a0983779b8e9d85993882a5ddebc37365f2fa86 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 2 Jul 2020 15:57:16 +0200 Subject: qt5-build.eclass: Limit qtchooser config install to --- eclass/qt5-build.eclass | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'eclass/qt5-build.eclass') diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index bc5928d33140..d781a02e647d 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -258,22 +258,23 @@ qt5-build_src_install() { "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ || die "sed failed (qconfig.h)" - # install qtchooser configuration file - cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die - ${QT5_BINDIR} - ${QT5_LIBDIR} - _EOF_ - - ( - insinto /etc/xdg/qtchooser - doins "${T}/qt5-${CHOST}.conf" - ) - - # convenience symlinks - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf - dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf - # TODO bug 522646: write an eselect module to manage default.conf - dosym qt5.conf /etc/xdg/qtchooser/default.conf + if ver_test -lt 5.15.2-r10; then + # install qtchooser configuration file + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die + ${QT5_BINDIR} + ${QT5_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt5-${CHOST}.conf" + ) + + # convenience symlinks + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf + dosym qt5.conf /etc/xdg/qtchooser/default.conf + fi fi qt5_install_module_config -- cgit v1.2.3-65-gdbad