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

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 a11cc47221e9790f90dbe75b010c31308c8a997c..cd314f541281b608807727e241769f636f42b2a8 100644 (file)
--- 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 4123b53dc568969eb9d1402dddd395c659758d50..bbdb51264343c2e87bddb9a85613fb9006a4df78 100644 (file)
--- 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 \