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 A651D1384B4 for ; Sun, 27 Dec 2015 02:32:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5C8CE07C7; Sun, 27 Dec 2015 02:32:47 +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 5ED27E07C7 for ; Sun, 27 Dec 2015 02:32:47 +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 74B6C3404A5 for ; Sun, 27 Dec 2015 02:32:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12109732 for ; Sun, 27 Dec 2015 02:32:43 +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: <1451169601.6283242f80ac9455e090c1fa31d4c4eb4ed79edc.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: 6283242f80ac9455e090c1fa31d4c4eb4ed79edc X-VCS-Branch: master Date: Sun, 27 Dec 2015 02:32:43 +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: 74ab478d-5247-4978-b99b-1bea04fcc9f5 X-Archives-Hash: 366b0283ded9bc7300a8bef6f0576e07 commit: 6283242f80ac9455e090c1fa31d4c4eb4ed79edc Author: Davide Pesavento gentoo org> AuthorDate: Sat Dec 26 22:40:01 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 26 22:40:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6283242f qt5-build.eclass: declare some variables readonly eclass/qt5-build.eclass | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index ec4aa39..7bac25e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -23,7 +23,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx HOMEPAGE="https://www.qt.io/" LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" -QT5_MINOR_VERSION=$(get_version_component_range 2) +declare -r QT5_MINOR_VERSION=$(get_version_component_range 2) if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then # IMPORTANT: add a subslot dependency to your package only if you are sure @@ -65,6 +65,7 @@ case ${PV} in S=${WORKDIR}/${MY_P} ;; esac +readonly QT5_BUILD_TYPE EGIT_REPO_URI=( "git://code.qt.io/qt/${QT5_MODULE}.git" @@ -398,21 +399,21 @@ qt_use_disable_mod() { qt5_prepare_env() { # setup installation directories # note: keep paths in sync with qmake-utils.eclass - 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 + 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 if [[ ${QT5_MODULE} == qtbase ]]; then # see mkspecs/features/qt_config.prf