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 C04D0138331 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 E4888E09B7; Thu, 25 Jan 2018 12:10:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C7B1DE09B7 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 522E5335C2F 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 DD5321CF 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.bd9b392f33aaf1810c7d59830f495d0ae2ae728d.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: bd9b392f33aaf1810c7d59830f495d0ae2ae728d 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: 3f41f770-bd5f-4d6f-bd5d-7af6e924c86c X-Archives-Hash: f10eff42ae5167d4c53c8d6842e90169 commit: bd9b392f33aaf1810c7d59830f495d0ae2ae728d Author: Michael Palimaka gentoo org> AuthorDate: Thu Jan 25 12:09:55 2018 +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=bd9b392f qt5-build.eclass: restrict qconfig.pri regeneration changes to 5.9.4 and later eclass/qt5-build.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 54e4b321..bc477889 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -804,7 +804,7 @@ qt5_install_module_qconfigs() { doins "${T}"/${PN}-qconfig.pri ) - if [[ ${PN} = qtcore ]]; then + if [[ ${PN} = qtcore && ${QT5_MINOR_VERSION} -ge 9 && ${QT5_PATCH_VERSION} -ge 4 ]]; then insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri qconfig-qtcore.pri fi @@ -830,9 +830,13 @@ qt5_regenerate_global_qconfigs() { local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri local qconfig_pri_orig=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/gentoo/qconfig-qtcore.pri - if [[ -f ${qconfig_pri} && -f ${qconfig_pri_orig} ]]; then + if [[ -f ${qconfig_pri} ]]; then local x qconfig_add= qconfig_remove= - local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") + if [[ -f ${qconfig_pri_orig} ]]; then + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri_orig}") + else + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") + fi local new_qt_config= # generate list of QT_CONFIG entries from the existing list,