[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 22:23:03 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 22:23:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4c8756

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

 dev-qt/qt-creator/qt-creator-4.2.0.ebuild | 4 ++--
 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 a11cc47221e..cd314f54128 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 4123b53dc56..bbdb5126434 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 \