gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-qt/qt-creator: query llvm-config instead of hardcoding the path

Browse Source 
Fixes build against clang-4.0

Gentoo-Bug: 612634
Package-Manager: Portage-2.3.4, Repoman-2.3.2
This commit is contained in:
Davide Pesavento
2017-03-14 23:23:03 +01:00
parent 58c8bdaeac
commit 7a4c87565f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-qt/qt-creator/qt-creator-4.2.0.ebuild
View File

@@ -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 \

4
dev-qt/qt-creator/qt-creator-9999.ebuild
View File

@@ -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 \