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 74C8F1388C1 for ; Mon, 28 Dec 2015 03:40:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D15B7E0782; Mon, 28 Dec 2015 03:40:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FDB0E0782 for ; Mon, 28 Dec 2015 03:40:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78FC43406DD for ; Mon, 28 Dec 2015 03:40:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44F36C7A for ; Mon, 28 Dec 2015 03:40:25 +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: <1451273043.ea1ae9b4c958d98b7cc7b26a26cf8972f658e451.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: ea1ae9b4c958d98b7cc7b26a26cf8972f658e451 X-VCS-Branch: master Date: Mon, 28 Dec 2015 03:40: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 X-Archives-Salt: 510e0850-12a3-4d2f-8f6f-faccd85ea5b8 X-Archives-Hash: df9ab5341afb02f529ece65ec625f134 commit: ea1ae9b4c958d98b7cc7b26a26cf8972f658e451 Author: Davide Pesavento gentoo org> AuthorDate: Mon Dec 28 03:23:41 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Dec 28 03:24:03 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ea1ae9b4 qt5-build.eclass: use 'readonly' instead of 'declare -g -r' The -g option to declare was added in bash-4.2, so we cannot rely on it (we still need to support EAPI 5). eclass/qt5-build.eclass | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0ab7770..7ad8cf4 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -381,21 +381,25 @@ qt_use_disable_mod() { qt5_prepare_env() { # setup installation directories # note: keep paths in sync with qmake-utils.eclass - declare -g -r QT5_PREFIX=${EPREFIX}/usr - declare -g -r QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 - declare -g -r QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) - declare -g -r QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 - declare -g -r QT5_BINDIR=${QT5_ARCHDATADIR}/bin - declare -g -r QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins - declare -g -r QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec - declare -g -r QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports - declare -g -r QT5_QMLDIR=${QT5_ARCHDATADIR}/qml - declare -g -r QT5_DATADIR=${QT5_PREFIX}/share/qt5 - declare -g -r QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} - declare -g -r QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations - declare -g -r QT5_EXAMPLESDIR=${QT5_DATADIR}/examples - declare -g -r QT5_TESTSDIR=${QT5_DATADIR}/tests - declare -g -r QT5_SYSCONFDIR=${EPREFIX}/etc/xdg + QT5_PREFIX=${EPREFIX}/usr + QT5_HEADERDIR=${QT5_PREFIX}/include/qt5 + QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir) + QT5_ARCHDATADIR=${QT5_PREFIX}/$(get_libdir)/qt5 + QT5_BINDIR=${QT5_ARCHDATADIR}/bin + QT5_PLUGINDIR=${QT5_ARCHDATADIR}/plugins + QT5_LIBEXECDIR=${QT5_ARCHDATADIR}/libexec + QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports + QT5_QMLDIR=${QT5_ARCHDATADIR}/qml + QT5_DATADIR=${QT5_PREFIX}/share/qt5 + QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations + QT5_EXAMPLESDIR=${QT5_DATADIR}/examples + QT5_TESTSDIR=${QT5_DATADIR}/tests + QT5_SYSCONFDIR=${EPREFIX}/etc/xdg + readonly QT5_PREFIX QT5_HEADERDIR QT5_LIBDIR QT5_ARCHDATADIR \ + QT5_BINDIR QT5_PLUGINDIR QT5_LIBEXECDIR QT5_IMPORTDIR \ + QT5_QMLDIR QT5_DATADIR QT5_DOCDIR QT5_TRANSLATIONDIR \ + QT5_EXAMPLESDIR QT5_TESTSDIR QT5_SYSCONFDIR if [[ ${QT5_MODULE} == qtbase ]]; then # see mkspecs/features/qt_config.prf