diff options
| author |   Peter Levine <plevine457@gmail.com> | 2020-05-08 03:11:14 -0400 |
|---|---|---|
| committer |   Jason A. Donenfeld <zx2c4@gentoo.org> | 2020-06-25 01:11:04 -0600 |
| commit | 24dd58fe4592775fe430ee98d17ecb7825a02ade (patch) | |
| tree | 07cbc91a23c170cbccd4ba206e400ad1096dae42 /dev-qt/qt-creator/qt-creator-9999.ebuild | |
| parent | dev-qt/qt-creator: Add bdeps (diff) | |
| download | gentoo-24dd58fe4592775fe430ee98d17ecb7825a02ade.tar.gz gentoo-24dd58fe4592775fe430ee98d17ecb7825a02ade.tar.bz2 gentoo-24dd58fe4592775fe430ee98d17ecb7825a02ade.zip | |
dev-qt/qt-creator: Support clang-10
Builds and runs without issue using patch from
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/299377
Closes: https://bugs.gentoo.org/720240
Closes: https://bugs.gentoo.org/711788
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457@gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-9999.ebuild')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index bf48a061bdef..01f6e2d47c2b 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LLVM_MAX_SLOT=8 +LLVM_MAX_SLOT=10 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW" inherit llvm qmake-utils virtualx xdg @@ -64,7 +64,14 @@ CDEPEND=" >=dev-qt/qtwidgets-${QT_PV} >=dev-qt/qtx11extras-${QT_PV} >=dev-qt/qtxml-${QT_PV} - clang? ( sys-devel/clang:8= ) + clang? ( + || ( + sys-devel/clang:10 + sys-devel/clang:9 + sys-devel/clang:8 + ) + <sys-devel/clang-$((LLVM_MAX_SLOT + 1)):= + ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} @@ -101,6 +108,8 @@ for x in ${PLOCALES}; do done unset x +PATCHES=( "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch ) + pkg_setup() { use clang && llvm_pkg_setup } |