| 1 |
commit: 7e9c2afe9ebaefd10c539abf14496650b8bc7bb9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 5 20:35:52 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 5 20:35:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7e9c2afe |
| 7 |
|
| 8 |
dev-qt/qdoc: Fix build |
| 9 |
|
| 10 |
Upstream commit e181ec2c20ede6b878187f3123d190e8b952deb1 |
| 11 |
|
| 12 |
Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com> |
| 13 |
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 14 |
Bug: https://bugs.gentoo.org/676948 |
| 15 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-qt/qdoc/qdoc-5.12.1.ebuild | 13 ++++++++----- |
| 19 |
1 file changed, 8 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qdoc/qdoc-5.12.1.ebuild b/dev-qt/qdoc/qdoc-5.12.1.ebuild |
| 22 |
index a7c87f07..02aa22c3 100644 |
| 23 |
--- a/dev-qt/qdoc/qdoc-5.12.1.ebuild |
| 24 |
+++ b/dev-qt/qdoc/qdoc-5.12.1.ebuild |
| 25 |
@@ -28,10 +28,13 @@ src_prepare() { |
| 26 |
qt_use_disable_mod qml qmldevtools-private \ |
| 27 |
src/qdoc/qdoc.pro |
| 28 |
|
| 29 |
- export LLVM_INSTALL_DIR="$(llvm-config --prefix)" |
| 30 |
- # this is normally loaded in qttools.pro, so skipped by using |
| 31 |
- # QT_TARGET_SUBDIRS causing build to fail |
| 32 |
- sed -e '1iload(qt_find_clang)\' -i src/qdoc/qdoc.pro || die |
| 33 |
- |
| 34 |
qt5-build_src_prepare |
| 35 |
} |
| 36 |
+ |
| 37 |
+src_configure() { |
| 38 |
+ # src/qdoc requires files that are only generated when qmake is |
| 39 |
+ # run in the root directory. bug 676948; same fix as bug 633776 |
| 40 |
+ mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die |
| 41 |
+ qt5_qmake "${QT5_BUILD_DIR}" |
| 42 |
+ qt5-build_src_configure |
| 43 |
+} |
Archives