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 BD8E61382C5 for ; Thu, 25 Jan 2018 12:10:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD1ADE09B1; Thu, 25 Jan 2018 12:10:31 +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 BA99CE09B1 for ; Thu, 25 Jan 2018 12:10:31 +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 5866B335C30 for ; Thu, 25 Jan 2018 12:10:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9BCD1C6 for ; Thu, 25 Jan 2018 12:10:28 +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: <1516882220.7536ec0475e6339a5ff706677a096814d750e072.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: 7536ec0475e6339a5ff706677a096814d750e072 X-VCS-Branch: master Date: Thu, 25 Jan 2018 12:10:28 +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: e896411c-fe01-401c-adc9-6f84bad25039 X-Archives-Hash: 6c4e95b507d245634eeaa2ce2f5ba768 commit: 7536ec0475e6339a5ff706677a096814d750e072 Author: i.Dark_Templar dark-templar-archives net> AuthorDate: Thu Oct 19 20:58:00 2017 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jan 25 12:10:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7536ec04 qt5-build.eclass: fix qconfig.pri regeneration. Closes: https://github.com/gentoo/gentoo/pull/5991 eclass/qt5-build.eclass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 82855656..54e4b321 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -803,6 +803,11 @@ qt5_install_module_qconfigs() { insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo doins "${T}"/${PN}-qconfig.pri ) + + if [[ ${PN} = qtcore ]]; then + insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo + newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri + fi } # @FUNCTION: qt5_regenerate_global_qconfigs @@ -824,9 +829,10 @@ qt5_regenerate_global_qconfigs() { einfo "Updating QT_CONFIG in qconfig.pri" local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri - if [[ -f ${qconfig_pri} ]]; then + local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri + if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then local x qconfig_add= qconfig_remove= - local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") local new_qt_config= # generate list of QT_CONFIG entries from the existing list, @@ -847,6 +853,6 @@ qt5_regenerate_global_qconfigs() { sed -i -e "s/^QT_CONFIG\s*+=.*/QT_CONFIG +=${new_qt_config}/" \ "${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in ${qconfig_pri}" else - ewarn "${qconfig_pri} does not exist or is not a regular file" + ewarn "${qconfig_pri} or ${qconfig_pri_orig} does not exist or is not a regular file" fi }