From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D6299138233 for ; Wed, 2 Jan 2013 00:02:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5B7E21C038; Wed, 2 Jan 2013 00:02:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 299C921C038 for ; Wed, 2 Jan 2013 00:02:35 +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 39A4333D929 for ; Wed, 2 Jan 2013 00:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 70505E5442 for ; Wed, 2 Jan 2013 00:02:32 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1357084839.c68366b7690a9d8c17a3e474a0021b52df39ccc3.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: c68366b7690a9d8c17a3e474a0021b52df39ccc3 X-VCS-Branch: master Date: Wed, 2 Jan 2013 00:02:32 +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: c6a3d8ec-2f0f-4f56-b44f-db42cf4a68d0 X-Archives-Hash: 9ed6fd2c23e51322d4e00fa436d24b95 commit: c68366b7690a9d8c17a3e474a0021b52df39ccc3 Author: Davide Pesavento gmail com> AuthorDate: Wed Jan 2 00:00:39 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 2 00:00:39 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c68366b7 [qt5-build.eclass] Make qconfig.pri parsing less strict. --- eclass/qt5-build.eclass | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 7295c8f..50fc114 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -515,28 +515,28 @@ qt5_install_module_qconfigs() { qt5_regenerate_global_qconfigs() { einfo "Regenerating gentoo-qconfig.h" - find "${ROOT}${QT5_HEADERDIR}"/Gentoo \ + find "${ROOT%/}${QT5_HEADERDIR}"/Gentoo \ -name '*-qconfig.h' -a \! -name 'gentoo-qconfig.h' -type f \ -execdir cat '{}' + > "${T}"/gentoo-qconfig.h [[ -s ${T}/gentoo-qconfig.h ]] || ewarn "Generated gentoo-qconfig.h is empty" - mv -f "${T}"/gentoo-qconfig.h "${ROOT}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ + mv -f "${T}"/gentoo-qconfig.h "${ROOT%/}${QT5_HEADERDIR}"/Gentoo/gentoo-qconfig.h \ || eerror "Failed to install new gentoo-qconfig.h" einfo "Updating QT_CONFIG in qconfig.pri" - local qconfig_pri=${ROOT}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri + local qconfig_pri=${ROOT%/}${QT5_ARCHDATADIR}/mkspecs/qconfig.pri if [[ -f ${qconfig_pri} ]]; then local x qconfig_add= qconfig_remove= - local qt_config=$(sed -n 's/^QT_CONFIG +=//p' "${qconfig_pri}") + local qt_config=$(sed -n 's/^QT_CONFIG\s*+=\s*//p' "${qconfig_pri}") local new_qt_config= # generate list of QT_CONFIG entries from the existing list, # appending QCONFIG_ADD and excluding QCONFIG_REMOVE eshopts_push -s nullglob - for x in "${ROOT}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do - qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=//p' "${x}")" - qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=//p' "${x}")" + for x in "${ROOT%/}${QT5_ARCHDATADIR}"/mkspecs/gentoo/*-qconfig.pri; do + qconfig_add+=" $(sed -n 's/^QCONFIG_ADD=\s*//p' "${x}")" + qconfig_remove+=" $(sed -n 's/^QCONFIG_REMOVE=\s*//p' "${x}")" done eshopts_pop for x in ${qt_config} ${qconfig_add}; do @@ -546,9 +546,9 @@ qt5_regenerate_global_qconfigs() { done # now replace the existing QT_CONFIG with the generated list - sed -i -e "s/^QT_CONFIG +=.*/QT_CONFIG +=${new_qt_config}/" \ - "${qconfig_pri}" || eerror "Failed to sed QT_CONFIG in qconfig.pri" + 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} does not exist or is not a regular file" fi }