pesa 15/05/10 14:27:29
Modified: qt4-build-multilib.eclass qt5-build.eclass
Log:
Add note to qt{4,5}_prepare_env()
Revision Changes Path
1.15 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.15&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.15&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.14&r2=1.15
Index: qt4-build-multilib.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qt4-build-multilib.eclass 10 May 2015 01:06:49 -0000 1.14
+++ qt4-build-multilib.eclass 10 May 2015 14:27:29 -0000 1.15
@@ -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/qt4-build-multilib.eclass,v 1.14
2015/05/10 01:06:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.15
2015/05/10 14:27:29 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -538,6 +538,7 @@
# 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
1.17 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.17&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.17&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.16&r2=1.17
Index: qt5-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt5-build.eclass 19 Apr 2015 18:22:15 -0000 1.16
+++ qt5-build.eclass 10 May 2015 14:27:29 -0000 1.17
@@ -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/qt5-build.eclass,v 1.16 2015/04/19
18:22:15 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.17 2015/05/10
14:27:29 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -389,6 +389,7 @@
# 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)
