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 9F5E2138CD0 for ; Sun, 10 May 2015 14:50:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BAD6E0844; Sun, 10 May 2015 14:50:15 +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 D9667E0844 for ; Sun, 10 May 2015 14:50:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3FF2340E65 for ; Sun, 10 May 2015 14:50:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 331819CD for ; Sun, 10 May 2015 14:50:12 +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: <1431269392.cd976c551901203f7f60c10325f88f250fb080d8.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qmake-utils.eclass eclass/qt4-build-multilib.eclass eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: cd976c551901203f7f60c10325f88f250fb080d8 X-VCS-Branch: master Date: Sun, 10 May 2015 14:50:12 +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: f3913293-b669-4b4c-8b9c-ec5354e512ca X-Archives-Hash: 87d799e3f67e7f0c5a49664df030d6dc commit: cd976c551901203f7f60c10325f88f250fb080d8 Author: Davide Pesavento gentoo org> AuthorDate: Sun May 10 14:49:52 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun May 10 14:49:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd976c55 [eclass] Sync. eclass/qmake-utils.eclass | 28 ++++++++++++++++++++++++++++ eclass/qt4-build-multilib.eclass | 1 + eclass/qt5-build.eclass | 1 + 3 files changed, 30 insertions(+) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 725a5a5..ff8b352 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -28,6 +28,20 @@ qt4_get_bindir() { fi } +# @FUNCTION: qt4_get_headerdir +# @DESCRIPTION: +# Echoes the directory where Qt4 headers are installed. +qt4_get_headerdir() { + echo ${EPREFIX}/usr/include/qt4 +} + +# @FUNCTION: qt4_get_mkspecsdir +# @DESCRIPTION: +# Echoes the directory where Qt4 mkspecs are installed. +qt4_get_mkspecsdir() { + echo ${EPREFIX}/usr/share/qt4/mkspecs +} + # @FUNCTION: qt5_get_bindir # @DESCRIPTION: # Echoes the directory where Qt5 binaries are installed. @@ -35,6 +49,20 @@ qt5_get_bindir() { echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin } +# @FUNCTION: qt5_get_headerdir +# @DESCRIPTION: +# Echoes the directory where Qt5 headers are installed. +qt5_get_headerdir() { + echo ${EPREFIX}/usr/include/qt5 +} + +# @FUNCTION: qt5_get_mkspecsdir +# @DESCRIPTION: +# Echoes the directory where Qt5 mkspecs are installed. +qt5_get_mkspecsdir() { + echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs +} + # @FUNCTION: qmake-utils_find_pro_file # @RETURN: zero or one qmake .pro file names # @INTERNAL diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 0fbe454..a244484 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -538,6 +538,7 @@ qt_native_use() { # Prepares the environment for building Qt. qt4_prepare_env() { # setup installation directories + # note: keep paths in sync with qmake-utils.eclass QT4_PREFIX=${EPREFIX}/usr QT4_HEADERDIR=${QT4_PREFIX}/include/qt4 QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index ea55dcf..f8c7674 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -389,6 +389,7 @@ qt_use_disable_mod() { # Prepares the environment for building Qt. 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)