commit: 58641f1052356f3da0fec847a6ce33c40995832b Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> AuthorDate: Sun Oct 8 23:48:31 2017 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 23:48:31 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58641f10
dev-qt/qt-creator: restrict max clang version Closes: https://bugs.gentoo.org/631194 Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild index fbfc4412faa..5be7d95dd51 100644 --- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 +LLVM_MAX_SLOT=4 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW" inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg @@ -51,7 +52,10 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clangcodemodel? ( >=sys-devel/clang-3.9:= ) + clangcodemodel? ( + <sys-devel/clang-5:= + || ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) + ) designer? ( >=dev-qt/designer-${QT_PV} ) qbs? ( >=dev-util/qbs-1.8.1-r1 ) systemd? ( sys-apps/systemd:= ) @@ -71,7 +75,10 @@ RDEPEND="${CDEPEND} sys-devel/gdb[client,python] autotools? ( sys-devel/autoconf ) bazaar? ( dev-vcs/bzr ) - clangstaticanalyzer? ( >=sys-devel/clang-3.9:* ) + clangstaticanalyzer? ( + <sys-devel/clang-5:* + || ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 ) + ) cmake? ( dev-util/cmake[server(+)] ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) @@ -153,7 +160,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \
