diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-05-10 15:24:30 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-10 15:24:30 +0000 |
| commit | 12ba34593baa14c9b097179588378dd840c927cb (patch) | |
| tree | 9822dced815ff542fcf0b0b4f2a4c85d934cb3f7 /eclass | |
| parent | Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830. (diff) | |
| download | gentoo-2-12ba34593baa14c9b097179588378dd840c927cb.tar.gz gentoo-2-12ba34593baa14c9b097179588378dd840c927cb.tar.bz2 gentoo-2-12ba34593baa14c9b097179588378dd840c927cb.zip | |
Don't prepend EPREFIX for {header,mkspecs}dir since these are mostly used with insinto and friends.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qmake-utils.eclass | 20 |
2 files changed, 18 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3f31b8c7c7c1..e3b0e1a8dd11 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1612 2015/05/10 14:47:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1613 2015/05/10 15:24:30 pesa Exp $ + + 10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass: + Don't prepend EPREFIX for {header,mkspecs}dir since these are mostly used + with insinto and friends. 10 May 2015; Davide Pesavento <pesa@gentoo.org> qmake-utils.eclass: Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830. diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 223c5e466609..24eb829dafb4 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.7 2015/05/10 14:47:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.8 2015/05/10 15:24:30 pesa Exp $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: @@ -20,6 +20,8 @@ inherit eutils multilib toolchain-funcs # @DESCRIPTION: # Echoes the directory where Qt4 binaries are installed. qt4_get_bindir() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin if [[ -d ${qtbindir} ]]; then echo ${qtbindir} @@ -31,36 +33,42 @@ qt4_get_bindir() { # @FUNCTION: qt4_get_headerdir # @DESCRIPTION: # Echoes the directory where Qt4 headers are installed. +# Does not take EPREFIX into account. qt4_get_headerdir() { - echo ${EPREFIX}/usr/include/qt4 + echo /usr/include/qt4 } # @FUNCTION: qt4_get_mkspecsdir # @DESCRIPTION: # Echoes the directory where Qt4 mkspecs are installed. +# Does not take EPREFIX into account. qt4_get_mkspecsdir() { - echo ${EPREFIX}/usr/share/qt4/mkspecs + echo /usr/share/qt4/mkspecs } # @FUNCTION: qt5_get_bindir # @DESCRIPTION: # Echoes the directory where Qt5 binaries are installed. qt5_get_bindir() { + has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= + echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin } # @FUNCTION: qt5_get_headerdir # @DESCRIPTION: # Echoes the directory where Qt5 headers are installed. +# Does not take EPREFIX into account. qt5_get_headerdir() { - echo ${EPREFIX}/usr/include/qt5 + echo /usr/include/qt5 } # @FUNCTION: qt5_get_mkspecsdir # @DESCRIPTION: # Echoes the directory where Qt5 mkspecs are installed. +# Does not take EPREFIX into account. qt5_get_mkspecsdir() { - echo ${EPREFIX}/usr/$(get_libdir)/qt5/mkspecs + echo /usr/$(get_libdir)/qt5/mkspecs } # @FUNCTION: qmake-utils_find_pro_file @@ -252,8 +260,6 @@ eqmake4() { eqmake5() { debug-print-function ${FUNCNAME} "$@" - has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX= - ebegin "Running qmake" "$(qt5_get_bindir)"/qmake \ |