diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-05-10 14:47:55 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-10 14:47:55 +0000 |
| commit | 5b295c082fb1178c17aa54a6fff0e225d6cb3269 (patch) | |
| tree | dbe95552f1abdcee6111092b324fb460473b707f /eclass | |
| parent | Give some credit. (diff) | |
| download | gentoo-2-5b295c082fb1178c17aa54a6fff0e225d6cb3269.tar.gz gentoo-2-5b295c082fb1178c17aa54a6fff0e225d6cb3269.tar.bz2 gentoo-2-5b295c082fb1178c17aa54a6fff0e225d6cb3269.zip | |
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qmake-utils.eclass | 30 |
2 files changed, 33 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a61dcb5c3d42..3f31b8c7c7c1 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1611 2015/05/10 01:06:49 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1612 2015/05/10 14:47:55 pesa Exp $ + + 10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass: + Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830. 10 May 2015; Davide Pesavento <pesa@gentoo.org> qt4-build-multilib.eclass: Delete obsolete code that is now causing problems on freebsd (bug 493310). diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 641af8cbf6ca..223c5e466609 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.6 2015/02/26 01:52:15 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.7 2015/05/10 14:47:55 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -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 |