pesa 15/05/10 15:24:30
Modified: ChangeLog qmake-utils.eclass
Log:
Don't prepend EPREFIX for {header,mkspecs}dir since these are mostly used
with insinto and friends.
Revision Changes Path
1.1613 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1613&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1612&r2=1.1613
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1612
retrieving revision 1.1613
diff -u -r1.1612 -r1.1613
--- ChangeLog 10 May 2015 14:47:55 -0000 1.1612
+++ ChangeLog 10 May 2015 15:24:30 -0000 1.1613
@@ -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 <p...@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 <p...@gentoo.org> qmake-utils.eclass:
Add qt{4,5}_get_{header,mkspecs}dir helper functions, bug 525830.
1.8 eclass/qmake-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.7&r2=1.8
Index: qmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qmake-utils.eclass 10 May 2015 14:47:55 -0000 1.7
+++ qmake-utils.eclass 10 May 2015 15:24:30 -0000 1.8
@@ -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 @@
# @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 @@
# @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 @@
eqmake5() {
debug-print-function ${FUNCNAME} "$@"
- has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
-
ebegin "Running qmake"
"$(qt5_get_bindir)"/qmake \
