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 5681D1396D1 for ; Fri, 22 Sep 2017 14:45:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CB601FC18A; Fri, 22 Sep 2017 14:45:03 +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 5AE681FC18A for ; Fri, 22 Sep 2017 14:45:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2E3B733BF43 for ; Fri, 22 Sep 2017 14:45:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98A0B9084 for ; Fri, 22 Sep 2017 14:45:00 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1506091488.66dcf031932854324c8fbe1be883e66a66988968.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 66dcf031932854324c8fbe1be883e66a66988968 X-VCS-Branch: master Date: Fri, 22 Sep 2017 14:45:00 +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-Archives-Salt: fb269d6a-350f-4379-97f6-070b6e1e7884 X-Archives-Hash: 86df435e64620b6096ab4c58bbcbb070 commit: 66dcf031932854324c8fbe1be883e66a66988968 Author: Michael Palimaka gentoo org> AuthorDate: Fri Sep 22 14:26:01 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Sep 22 14:44:48 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=66dcf031 qt5-build.eclass: fix 5.9.9999 and later live ebuilds qconfig.h is created at configure time in $QT5_BUILD_DIR. Live ebuilds are built out-of-source while release are not. Since the copy was happening in the source directory, a fatal error occurred in live ebuilds as qconfig.h is not where it was expected. eclass/qt5-build.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index fa775d36..fca63af4 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -680,13 +680,14 @@ qt5_base_configure() { einfo "Configuring with: ${conf[@]}" "${S}"/configure "${conf[@]}" || die "configure failed" - popd >/dev/null || die - if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then # a forwarding header is no longer created since 5.8, causing the system # config to always be used. bug 599636 cp src/corelib/global/qconfig.h include/QtCore/ || die fi + + popd >/dev/null || die + } # @FUNCTION: qt5_qmake