aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-02-05 21:35:52 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-02-05 21:35:52 +0100
commit7e9c2afe9ebaefd10c539abf14496650b8bc7bb9 (patch)
tree84cd8940617b6b5114cb8b4fb064208131e2950a
parentqt5-build.eclass: Drop obsolete Qt 5.12.0 quirk (diff)
downloadqt-7e9c2afe9ebaefd10c539abf14496650b8bc7bb9.tar.gz
qt-7e9c2afe9ebaefd10c539abf14496650b8bc7bb9.tar.bz2
qt-7e9c2afe9ebaefd10c539abf14496650b8bc7bb9.zip
dev-qt/qdoc: Fix build
Upstream commit e181ec2c20ede6b878187f3123d190e8b952deb1 Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> Thanks-to: Jimi Huotari <chiitoo@gentoo.org> Bug: https://bugs.gentoo.org/676948 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--dev-qt/qdoc/qdoc-5.12.1.ebuild13
1 files changed, 8 insertions, 5 deletions
diff --git a/dev-qt/qdoc/qdoc-5.12.1.ebuild b/dev-qt/qdoc/qdoc-5.12.1.ebuild
index a7c87f07..02aa22c3 100644
--- a/dev-qt/qdoc/qdoc-5.12.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.1.ebuild
@@ -28,10 +28,13 @@ src_prepare() {
qt_use_disable_mod qml qmldevtools-private \
src/qdoc/qdoc.pro
- export LLVM_INSTALL_DIR="$(llvm-config --prefix)"
- # this is normally loaded in qttools.pro, so skipped by using
- # QT_TARGET_SUBDIRS causing build to fail
- sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die
-
qt5-build_src_prepare
}
+
+src_configure() {
+ # src/qdoc requires files that are only generated when qmake is
+ # run in the root directory. bug 676948; same fix as bug 633776
+ mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
+ qt5_qmake "${QT5_BUILD_DIR}"
+ qt5-build_src_configure
+}