From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Skcvy-0002iY-FG for garchives@archives.gentoo.org; Fri, 29 Jun 2012 15:16:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78C63E0603; Fri, 29 Jun 2012 15:16:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4A778E0603 for ; Fri, 29 Jun 2012 15:16:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE22E1B4093 for ; Fri, 29 Jun 2012 15:16:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6DECAE5432 for ; Fri, 29 Jun 2012 15:16:25 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1340982927.fe0b75cd32209b4981e74dcbdb38b396a6456e63.pesa@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: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: fe0b75cd32209b4981e74dcbdb38b396a6456e63 X-VCS-Branch: master Date: Fri, 29 Jun 2012 15:16:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e4fec6c8-732d-4e14-bfc9-86368f86fc29 X-Archives-Hash: 1a63f827e98d58d39f1603536a9583cd commit: fe0b75cd32209b4981e74dcbdb38b396a6456e63 Author: Davide Pesavento gmail com> AuthorDate: Fri Jun 29 15:15:27 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Jun 29 15:15:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3Dfe0b75cd [qt5-build.eclass] Some fixes in qt5_regenerate_global_qconfigs(). --- eclass/qt5-build.eclass | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 9851c11..10ce73a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -443,26 +443,27 @@ qt5_regenerate_global_qconfigs() { =20 find "${ROOT}${QTHEADERDIR}"/Gentoo -name 'qt-*-qconfig.h' -type f \ -exec cat {} + > "${T}"/gentoo-qconfig.h - if [[ -s ${T}/gentoo-qconfig.h ]]; then - mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qc= onfig.h \ - || eerror "Failed to install new gentoo-qconfig.h" - else - eerror "Generated gentoo-qconfig.h is empty" - fi + + [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is = empty" + mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QTHEADERDIR}"/Gentoo/gentoo-qco= nfig.h \ + || eerror "Failed to install new gentoo-qconfig.h" =20 einfo "Updating QT_CONFIG in qconfig.pri" =20 - if [[ -f ${ROOT}${QTDATADIR}/mkspecs/qconfig.pri ]]; then + local qconfig_pri=3D${ROOT}${QTDATADIR}/mkspecs/qconfig.pri + if [[ -f ${qconfig_pri} ]]; then local x qconfig_add=3D qconfig_remove=3D - local qt_config=3D$(sed -n 's/^QT_CONFIG +=3D//p' "${ROOT}${QTDATADIR}= "/mkspecs/qconfig.pri) + local qt_config=3D$(sed -n 's/^QT_CONFIG +=3D//p' "${qconfig_pri}") local new_qt_config=3D =20 # generate list of QT_CONFIG entries from the existing list, - # adding QCONFIG_ADD and excluding QCONFIG_REMOVE + # appending QCONFIG_ADD and excluding QCONFIG_REMOVE + eshopts_push -s nullglob for x in "${ROOT}${QTDATADIR}"/mkspecs/gentoo/qt-*-qconfig.pri; do qconfig_add+=3D" $(sed -n 's/^QCONFIG_ADD=3D//p' "${x}")" qconfig_remove+=3D" $(sed -n 's/^QCONFIG_REMOVE=3D//p' "${x}")" done + eshopts_pop for x in ${qt_config} ${qconfig_add}; do if ! has "${x}" ${new_qt_config} ${qconfig_remove}; then new_qt_config+=3D" ${x}" @@ -471,9 +472,8 @@ qt5_regenerate_global_qconfigs() { =20 # now replace the existing QT_CONFIG with the generated list sed -i -e "s/^QT_CONFIG +=3D.*/QT_CONFIG +=3D${new_qt_config}/" \ - "${ROOT}${QTDATADIR}"/mkspecs/qconfig.pri \ - || eerror "Failed to sed QT_CONFIG in qconfig.pri" + "${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in qconfig.pri" else - eerror "qconfig.pri does not exist or is not a regular file" + ewarn "'${qconfig_pri}' does not exist or is not a regular file" fi }