From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F2FF138334 for ; Tue, 5 Feb 2019 20:38:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 531E5E0AE7; Tue, 5 Feb 2019 20:38:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B14EE0AE7 for ; Tue, 5 Feb 2019 20:38:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02EC9335DC3 for ; Tue, 5 Feb 2019 20:38:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3F0053A for ; Tue, 5 Feb 2019 20:38:50 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1549398952.7e9c2afe9ebaefd10c539abf14496650b8bc7bb9.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qdoc/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qdoc/qdoc-5.12.1.ebuild X-VCS-Directories: dev-qt/qdoc/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7e9c2afe9ebaefd10c539abf14496650b8bc7bb9 X-VCS-Branch: master Date: Tue, 5 Feb 2019 20:38:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f01359c-8aa9-4f19-97b1-baa43179f1ad X-Archives-Hash: f940d3529791341cc7a0d86520ed1b24 commit: 7e9c2afe9ebaefd10c539abf14496650b8bc7bb9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 5 20:35:52 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 5 20:35:52 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7e9c2afe dev-qt/qdoc: Fix build Upstream commit e181ec2c20ede6b878187f3123d190e8b952deb1 Reported-by: Arfrever Frehtes Taifersar Arahesis gmail.com> Thanks-to: Jimi Huotari gentoo.org> Bug: https://bugs.gentoo.org/676948 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qdoc/qdoc-5.12.1.ebuild | 13 ++++++++----- 1 file 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 +}