diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2017-03-14 23:23:03 +0100 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2017-03-14 23:23:35 +0100 |
| commit | 7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb (patch) | |
| tree | a1a45f1b0417efa00acdf82eb8688476acc3b673 /dev-qt | |
| parent | dev-qt/qt-creator: remove old (diff) | |
| download | gentoo-7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb.tar.gz gentoo-7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb.tar.bz2 gentoo-7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb.zip | |
dev-qt/qt-creator: query llvm-config instead of hardcoding the path
Fixes build against clang-4.0
Gentoo-Bug: 612634
Package-Manager: Portage-2.3.4, Repoman-2.3.2
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-4.2.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild b/dev-qt/qt-creator/qt-creator-4.2.0.ebuild index a11cc47221e9..cd314f541281 100644 --- a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-4.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -150,7 +150,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \ diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 4123b53dc568..bbdb51264343 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -150,7 +150,7 @@ src_prepare() { src_configure() { eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \ IDE_PACKAGE_MODE=1 \ - $(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \ + $(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \ $(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \ CONFIG+=qbs_disable_rpath \ CONFIG+=qbs_enable_project_file_updates \ |