[gentoo-commits] proj/qt:master commit in: dev-python/shiboken/

[Davide Pesavento]

commit:     1c4b5030fc575bc2a7ed66b59e42c6dce9599543
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 21:24:49 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 21:25:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1c4b5030

dev-python/shiboken: fix detection of clang builtin includes

Bug: https://bugs.gentoo.org/624682
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-python/shiboken/shiboken-9999.ebuild | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index bc1ee479..0192869d 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -50,8 +50,7 @@ llvm_check_deps() {
 src_prepare() {
 	#FIXME: File an upstream issue requesting a sane way to disable NumPy support.
 	if ! use numpy; then
-		sed -i -e '/print(os\.path\.realpath(numpy))/d' \
-			libshiboken/CMakeLists.txt || die
+		sed -i -e '/print(os\.path\.realpath(numpy))/d' libshiboken/CMakeLists.txt || die
 	fi
 
 	if use prefix; then
@@ -59,6 +58,10 @@ src_prepare() {
 		sed -i -e '1iinclude(rpath.cmake)' CMakeLists.txt || die
 	fi
 
+	# CMakeLists.txt assumes clang builtin includes are installed
+	# under LLVM_INSTALL_DIR. They are not on Gentoo. See bug 624682.
+	sed -i -e "/set(CLANG_BUILTIN_INCLUDES_DIR_PREFIX /s:\${CLANG_DIR}:${EPREFIX}/usr:" CMakeLists.txt || die
+
 	cmake-utils_src_prepare
 }
 
@@ -67,6 +70,7 @@ src_configure() {
 		local mycmakeargs=(
 			-DBUILD_TESTS=$(usex test)
 			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_SITE_PACKAGES="$(python_get_sitedir)"
 		)
 		# CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable.
 		LLVM_INSTALL_DIR="$(get_llvm_prefix)" cmake-utils_src_configure